diff --git a/sol.cc b/sol.cc index cd3137b8cbbb13a6e7ef3a3d6029dfd9fbe5ab17..c49515fa2180f0f1029902786b7424b4bfd63e94 100644 --- a/sol.cc +++ b/sol.cc @@ -288,25 +288,25 @@ int main (int argc, char *argv[]) /* preparing for work */ if (ipeak) { type='1'; - end=1023; - if (qe > end) { + end_hst=1023; + if (qe > end_hst) { fprintf(stderr,"## WARNING ## for peak analysis max. value is 1023. We will integrate up to 1023\n"); fprintf(lof,"## WARNING ## for peak analysis max. value is 1023. We will integrate up to 1023\n"); - qe=end; + qe=end_hst; } } if (qe > max_charge) { fprintf(stderr,"## WARNING ## qe can't be greater than max_charge=%d. Changing Qe to %d\n", max_charge, max_charge); fprintf(lof,"## WARNING ## qe can't be greater than max_charge=%d. Changing Qe to %d\n", max_charge, max_charge); - qe=end; + qe=end_hst; } /* determine number of bands */ int nbands=0; double nb=0.; if (iband) { - nb=(1.0*(end-start)/width); + nb=(1.0*(end_hst-start)/width); if (nb-int(nb)) nb+=1.; nbands=int(nb); @@ -347,7 +347,7 @@ int main (int argc, char *argv[]) fprintf(out, "# # L2 level file (lago@lagoproject.org): flux of signals as function of time\n"); fprintf(out, "# # Analysis is done by integrating the whole channel %d charge histogram in\n", channel); if (iband) { - fprintf(out, "# # %d bands of %d ADCq starting from %d ADCq and up to %d ADCq\n", nbands, width, start+1, end+1); + fprintf(out, "# # %d bands of %d ADCq starting from %d ADCq and up to %d ADCq\n", nbands, width, start+1, end_hst+1); fprintf(out, "# # %d columns format is:\n",nbands+4); if (iflux) fprintf(out, "# # utc pressure temperature total_flux(counts/s) band001 band002 ... band%03d\n",nbands); diff --git a/sol.h b/sol.h index 2b9c20c0e1b0054024df4a4cd6ba78fffb25348f..3f89e53b724077b9d3589bfd7d311e2f8e1c7a56 100644 --- a/sol.h +++ b/sol.h @@ -43,7 +43,7 @@ const int max_charge=4096; int avg_time = 10; double fluxtime=1.; double diameter = 0., height = 0.; -int channel=0, start=0, width=0, qs=0, end=max_charge, qe=max_charge; +int channel=0, start=0, width=0, qs=0, end_hst=max_charge, qe=max_charge; char type='0'; //charge int Open(char *nfi); inline double sign(double x);