Commit 40a04849 authored by Norbert Herrmann's avatar Norbert Herrmann
Browse files

merge fixes

parent acbbe091
......@@ -47,7 +47,7 @@ void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
// TObjString *tofDigiFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digi.par"); // TOF digi file
......
......@@ -49,7 +49,7 @@ void ana_digi_cal_all(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
// TObjString *tofDigiFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digi.par"); // TOF digi file
......
......@@ -55,7 +55,7 @@ void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
TObjString* tofDigiBdfFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digibdf.par");
......
......@@ -59,7 +59,7 @@ void ana_trks_eval(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TSt
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
TObjString* tofDigiBdfFile = new TObjString(workDir + "/parameters/tof/tof_" + TofGeo + ".digibdf.par");
......
......@@ -55,7 +55,7 @@ void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t c
if (iRun < 690) TofGeo = "v20a_mcbm";
else
TofGeo = "v21a_mcbm";
TofGeo = "v21d_mcbm";
TofGeo = "v21d_mcbm";
cout << "Geometry version " << TofGeo << endl;
/*
......
/** @file eval_raw.C
* @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
* @license SPDX-License-Identifier: GPL-3.0-only
* @authors Norbrt Herrmann [orginator] **/
/* Copyright (C) 2021 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
SPDX-License-Identifier: GPL-3.0-only
Authors: Norbert Herrmann [committer]*/
void eval_raw(Int_t nEvents = 10000000, Int_t calMode = 33, Int_t calSel = 1, Int_t calSm = 900, Int_t RefSel = 1,
TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
......
/** @file ana_trks_eval.C
* @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
* @license SPDX-License-Identifier: GPL-3.0-only
* @authors Norbert Herrmann [orginator] **/
/* Copyright (C) 2021 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
SPDX-License-Identifier: GPL-3.0-only
Authors: Norbert Herrmann [committer]*/
void ini_trks(Int_t iSel = 910041, Int_t iTrackingSetup = 4, Int_t iGenCor = 1, Double_t dScalFac = 1.,
Double_t dChi2Lim2 = 500., TString cCalId = "", Bool_t bUseSigCalib = kFALSE, Int_t iCalOpt = 1,
......
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