diff --git a/AculCalib/AculCalPars.h b/AculCalib/AculCalPars.h index e451f1de858abe5e6090b14f6c232f3ac1793bb8..4ed59ee75c93724877a5de968e85d66d2fd4c410 100644 --- a/AculCalib/AculCalPars.h +++ b/AculCalib/AculCalPars.h @@ -28,6 +28,7 @@ protected: TString fParFileName; + //todo energies used for calibration should be in this class //CsI parameters diff --git a/AculCalib/AculCalParsScint.cpp b/AculCalib/AculCalParsScint.cpp index 49bdca5662225030b8f0afb043b210de2d0ec52b..2465b6a32d08a45f75f799f0524df1598e183d65 100644 --- a/AculCalib/AculCalParsScint.cpp +++ b/AculCalib/AculCalParsScint.cpp @@ -75,6 +75,10 @@ void AculCalParsScint::SetPars() { fFilePars.resize(fNoFiles); for (Int_t j = 0; j < fNoFiles; j++) { line.ReadLine(infile); + if ( line.BeginsWith("#") || line.BeginsWith("//") ) { + j--; + continue; + } sscanf(line, "%s", fname); word = fname; fFilePars[j].SetRawFileName(fname); @@ -89,6 +93,10 @@ void AculCalParsScint::SetPars() { fCutsFileName = fname; for (Int_t j = 0; j < fNoCuts; j++) { line.ReadLine(infile); + if ( line.BeginsWith("#") || line.BeginsWith("//") ) { + j--; + continue; + } sscanf(line, "%s", cname); fCutName.push_back(cname); } diff --git a/macros/myMacros/SQ13Alpha.par b/macros/myMacros/SQ13Alpha.par index 43948c7e60cbbb4ec4456a36e410f6fc12e712b8..de6e14e3540e88d64d3228423dee0f70ea938e2a 100644 --- a/macros/myMacros/SQ13Alpha.par +++ b/macros/myMacros/SQ13Alpha.par @@ -1,6 +1,7 @@ energies 4 #number of energy points crystals 16 #number of crystals in detector files 4 +#fileID fileName data/csi_13_Ealpha16.root data/csi_13_Ealpha21.root data/csi_13_Ealpha26.root @@ -9,15 +10,17 @@ data/csi_13_Ealpha30.root cutFile cuts/cutsSQ13Alpha.root 8 cutsSQ13Alpha16 cutSQ13Alpha21 +# cutSQ13Alpha26 cutSQ13Alpha30 +# cutSQ13Alpha16Amp cutSQ13Alpha21Amp cutSQ13Alpha26Amp cutSQ13Alpha30Amp -#detector particle +#keyword detector particle detector SQ13 Alpha -#energy [MeV/A] +#keyword energy [MeV/A] energy 66.542 #channel minimum maximum 0 650 830