diff --git a/tracy/tracy/inc/read_script.h b/tracy/tracy/inc/read_script.h index 7527655af4ba169f9fcec0cb278721bf37773a5e..5e0478e70f90b0b05f873517c77f38def3e30b3e 100644 --- a/tracy/tracy/inc/read_script.h +++ b/tracy/tracy/inc/read_script.h @@ -53,7 +53,8 @@ extern bool MultipoleFlag , ThinsextFlag ; extern bool FitTuneFlag ; extern char qf[max_str],qd[max_str]; extern double targetnux, targetnuz; extern bool FitTune4Flag ; extern char qf1[max_str],qf2[max_str],qd1[max_str],qd2[max_str]; extern bool FitChromFlag ; extern char sxm1[max_str],sxm2[max_str]; extern double targetksix, targetksiz ; -extern bool ChamberFlag , ChamberNoU20Flag , ReadChamberFlag; +//extern bool ChamberFlag , +extern bool ReadChamberFlag; extern bool GirderErrorFlag ; extern bool SigmaFlag ; extern bool PX2Flag; diff --git a/tracy/tracy/src/read_script.cc b/tracy/tracy/src/read_script.cc index 01cf12b27a6bf7f37a4a179eea533e8551bf0a88..94a2fa061f236b532518abf802df82117990e857 100644 --- a/tracy/tracy/src/read_script.cc +++ b/tracy/tracy/src/read_script.cc @@ -84,7 +84,8 @@ bool FitTuneFlag = false; char qf[max_str],qd[max_str]; double targetnux = 0.0, bool FitTune4Flag = false; char qf1[max_str],qf2[max_str],qd1[max_str],qd2[max_str]; bool FitChromFlag = false; char sxm1[max_str],sxm2[max_str]; double targetksix = 0.0, targetksiz = 0.0; -bool ChamberFlag = false, ChamberNoU20Flag = false, ReadChamberFlag = false; +//bool ChamberFlag = false, +bool ReadChamberFlag = false; bool GirderErrorFlag = false; bool SigmaFlag = false; bool PX2Flag = false; @@ -132,7 +133,9 @@ void read_script(const char *param_file_name, bool rd_lat) LineNum++; - if (strstr(line, "#") == NULL && strcmp(line,"\n") != 0) { + /* read the end of line symbol '\n','\r' or '\r\n' at different operation system*/ + if (strstr(line, "#") == NULL && strcmp(line,"\n") != 0 && + strcmp(line,"\r") != 0 && strcmp(line,"\r\n") != 0) { // get initial command token sscanf(line, "%s", name); @@ -172,12 +175,9 @@ void read_script(const char *param_file_name, bool rd_lat) } /* read in bool flags */ - else if (strcmp("ChamberFlag", name) == 0){ - ChamberFlag = true; - } - else if (strcmp("ChamberNoU20Flag", name) == 0){ - ChamberNoU20Flag = true; - } + // else if (strcmp("ChamberFlag", name) == 0){ + // ChamberFlag = true; + // } else if (strcmp("ReadChamberFlag", name) == 0){ ReadChamberFlag = true; }