- new focusmerge.dat for new merge type
This commit is contained in:
@ -36,7 +36,7 @@ typedef int HistInt;
|
||||
|
||||
int medium, upper, lower;
|
||||
/*------------------------------------------------------------------------
|
||||
The tables with the theta values for the detector banks aand the merge
|
||||
The tables with the theta values for the detector banks and the merge
|
||||
table living in mergeUp, mergeMed, mergeLow is initialized from a
|
||||
data file, the mergefile. mergeUp, mergeLow, mergeMed contain a 0 if
|
||||
the detector from this bank does not need to be summed for this merged
|
||||
@ -225,9 +225,12 @@ int setFMDataPointer(HistInt *lData, int mytimeBins)
|
||||
fprintf(stdout,"ERROR: out of memory in fomerge.setFMdataPointer\n");
|
||||
return 0;
|
||||
}
|
||||
memset(mergedData,0,nMerged*timeBin*sizeof(HistInt));
|
||||
}
|
||||
|
||||
/*
|
||||
clear mergedData to 0
|
||||
*/
|
||||
memset(mergedData,0,nMerged*timeBin*sizeof(HistInt));
|
||||
iMerged = 0;
|
||||
return 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user