Commit c00864ac authored by Norbert Herrmann's avatar Norbert Herrmann
Browse files

merge fixes 2

parent 40a04849
......@@ -44,10 +44,17 @@ void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0
TString cRun(FId(0, iNLen));
Int_t iRun = cRun.Atoi();
TString TofGeo = "";
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
if (iRun < 690) TofGeo = "v20a_mcbm";
else {
if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
else {
if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
else {
TofGeo = "v21d_mcbm";
}
}
}
cout << "Geometry version " << TofGeo << endl;
// TObjString *tofDigiFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digi.par"); // TOF digi file
......
......@@ -45,11 +45,17 @@ void ana_digi_cal_all(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel
TString cRun(FId(0, iNLen));
Int_t iRun = cRun.Atoi();
TString TofGeo = "";
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
if (iRun < 690) TofGeo = "v20a_mcbm";
else {
if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
else {
if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
else {
TofGeo = "v21d_mcbm";
}
}
}
cout << "Geometry version " << TofGeo << endl;
// TObjString *tofDigiFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digi.par"); // TOF digi file
......
......@@ -53,10 +53,15 @@ void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString
if (iGeo == 0) {
TString TofGeo = "";
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
else {
if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
else {
if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
else {
TofGeo = "v21d_mcbm";
}
}
}
TObjString* tofDigiBdfFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digibdf.par");
parFileList->Add(tofDigiBdfFile);
......
......@@ -57,9 +57,16 @@ void ana_trks_eval(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TSt
if (iGeo == 0) {
TString TofGeo = "";
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
else {
if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
else {
if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
else {
TofGeo = "v21d_mcbm";
}
}
}
cout << "Geometry version " << TofGeo << endl;
TObjString* tofDigiBdfFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digibdf.par");
......
......@@ -51,11 +51,16 @@ void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t c
Int_t iGeo = 0; //iMc;
if (iGeo == 0) {
TString TofGeo = "";
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
else {
if (iRun < 1112) { TofGeo = "v21a_mcbm"; }
else {
if (iRun < 1400) { TofGeo = "v21b_mcbm"; }
else {
TofGeo = "v21d_mcbm";
}
}
}
cout << "Geometry version " << TofGeo << endl;
/*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment