From fc52688bfff960926dc500597f2f366c653e19f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Asorey?= <asoreyh@gmail.com>
Date: Sun, 23 Jul 2017 09:50:46 -0300
Subject: [PATCH] Change the name of variable end as it produce conflicts with
new c++ libraries
---
sol.cc | 12 ++++++------
sol.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sol.cc b/sol.cc
index cd3137b..c49515f 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 2b9c20c..3f89e53 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);
--
GitLab