- updated simulation

nxamor.c

@@ -394,10 +394,9 @@ static int WriteTOFDetector(char *name, pHistMem pHM, int *iDim,
     {
       if( (iDim[1] % i) == 0)
       {
-	if(i*chunkSize*sizeof(HistInt) > TOFBLOCK)
+	if(i*chunkSize*sizeof(HistInt) < TOFBLOCK)
 	{
 	  iChunk[1] = i;
-	  break;
         }
       }
     }
@@ -422,7 +421,8 @@ static int WriteTOFDetector(char *name, pHistMem pHM, int *iDim,
     {
       memset(lData,0,chunkSize*sizeof(HistInt));
       GetHistogramDirect(pHM,pCon, 
-		 0,i*chunkSize,chunkSize,lData,chunkSize*sizeof(HistInt));
+		 0,i*chunkSize,(i+1)*chunkSize,lData,
+			 chunkSize*sizeof(HistInt));
       /*
 	yield a little in order to allow other clients to receive a
         response. Also allow for interrupting.
@@ -639,7 +639,8 @@ static int WriteTOFDetector(char *name, pHistMem pHM, int *iDim,
 	  else
 	  {
             memset(lData,0,MAXSINGLE*iDim[2]*sizeof(HistInt));
-	    GetHistogramDirect(pHM,pCon,0,iLength,MAXSINGLE*iDim[2], 
+	    GetHistogramDirect(pHM,pCon,0,iLength,
+			       iLength + MAXSINGLE*iDim[2], 
                              lData, MAXSINGLE*iDim[2]*sizeof(HistInt));
 	    NXDputalias(hfil,hdict,"singleup",lData);
             NXDaliaslink(hfil,hdict,"singledana","singleup");