- Fixes to HM code for AMOR TOF
- A couple of TAS fixes - o2t was fixed to work with any drivable - FOCUS was mended to include beam monitor in data file
This commit is contained in:
@@ -1322,6 +1322,7 @@
|
||||
psdYSize = ntohs(my_rqst->u.cnfg.u.psd.ySize);
|
||||
printf("\txSize = %4d, ySize = %4d\n",
|
||||
psdXSize, psdYSize);
|
||||
N_hists = psdXSize*psdYSize+MAX_PSD_ED;
|
||||
|
||||
Tof_dts_soll = ntohl (my_rqst->u.cnfg.u.psd.preset_delay); /* The
|
||||
** required "Delay-Time-to-Start" */
|
||||
@@ -1368,6 +1369,7 @@
|
||||
edge_arr_pntr = &my_rqst->u.cnfg.u.psd.edge_0;
|
||||
for (i = 0; i < N_tof_edges; i++) {
|
||||
n_bins = ntohl (edge_arr_pntr->n_bins);
|
||||
N_bins = n_bins;
|
||||
flag = ntohl (edge_arr_pntr->flag);
|
||||
edge_0 = ntohl (edge_arr_pntr->edges[0]);
|
||||
edge_1 = ntohl (edge_arr_pntr->edges[1]);
|
||||
@@ -1567,7 +1569,8 @@
|
||||
Total_bytes += ((n_cntrs + MAX_PSD_ED) * n_bins * bytes_per_bin);
|
||||
|
||||
if (i == 0) { /* Use the first counter bank to define some .. */
|
||||
N_hists = n_cntrs; /* .. globals since we expect there usually to .. */
|
||||
N_hists = n_cntrs+MAX_PSD_ED;
|
||||
/* .. globals since we expect there usually to .. */
|
||||
/* .. be only 1 counter bank. */
|
||||
N_bins = n_bins;
|
||||
Lo_cntr = first;
|
||||
@@ -1591,6 +1594,7 @@
|
||||
}else {
|
||||
Hist_base_addr = NULL;
|
||||
}
|
||||
printf("Successfully allocated %d bytes\n", Total_bytes);
|
||||
if (Hist_base_addr == NULL) {
|
||||
printf ("\007do_SQHM__PSD_alloc:\n"
|
||||
" Unable to reserve %d bytes of memory!\n"
|
||||
|
||||
Reference in New Issue
Block a user