From f8b19e7b2d50424fb0b8bf0f567c206f4d4c14d0 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 28 Aug 2020 13:27:19 +0200
Subject: [PATCH] Test new mcbm beamtime setups
Test mcbm beamtime setups 2020_03 and 2021_03 instead of the 2019 ones.
Correct the reconstruction macro accordingly.
---
macro/mcbm/CMakeLists.txt | 4 ++--
macro/mcbm/mcbm_reco_event.C | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index 24295dd62c..0dba186881 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -22,9 +22,9 @@ Set(BeamAngle 25)
# Define the different setups to be tested
If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
- List(APPEND cbm_setup mcbm_beam_2019_03 mcbm_beam_2019_11)
+ List(APPEND cbm_setup mcbm_beam_2020_03 mcbm_beam_2021_03)
Else()
- List(APPEND cbm_setup mcbm_beam_2019_03 mcbm_beam_2019_11)
+ List(APPEND cbm_setup mcbm_beam_2020_03 mcbm_beam_2021_03)
EndIf()
ForEach(setup IN LISTS cbm_setup)
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index abb5e7cc3d..db9e80113a 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -320,7 +320,8 @@ void mcbm_reco_event(Int_t nEvents = 3,
break;
case 1: // for calibration mode of full setup
iMinNofHits = 3;
- iNStations = 39;
+ // iNStations = 39;
+ iNStations = 26;
iNReqStations = 3;
tofFindTracks->SetStation(0, 5, 0, 0);
tofFindTracks->SetStation(1, 0, 2, 2);
@@ -348,6 +349,8 @@ void mcbm_reco_event(Int_t nEvents = 3,
tofFindTracks->SetStation(23, 0, 3, 3);
tofFindTracks->SetStation(24, 0, 4, 4);
tofFindTracks->SetStation(25, 0, 3, 4);
+
+ /*
tofFindTracks->SetStation(26, 9, 0, 0);
tofFindTracks->SetStation(27, 9, 0, 1);
tofFindTracks->SetStation(28, 7, 0, 0);
@@ -361,6 +364,7 @@ void mcbm_reco_event(Int_t nEvents = 3,
tofFindTracks->SetStation(36, 8, 0, 5);
tofFindTracks->SetStation(37, 8, 0, 6);
tofFindTracks->SetStation(38, 8, 0, 7);
+ */
break;
}
@@ -429,12 +433,14 @@ void mcbm_reco_event(Int_t nEvents = 3,
std::cout << " All ok " << std::endl;
// ------------------------------------------------------------------------
// save all historgrams
+ /*
gROOT->LoadMacro("save_hst.C");
TString FSave = Form("save_hst(\"CluStatus%d_%d_Cal_%s.hst.root\")",
iCalSet,
iSel2in,
cCalId.Data());
gInterpreter->ProcessLine(FSave.Data());
+ */
// ----- Resource monitoring ------------------------------------------
if (hasFairMonitor) { // FairRoot Version >= 15.11
// Extract the maximal used memory an add is as Dart measurement
@@ -454,5 +460,5 @@ void mcbm_reco_event(Int_t nEvents = 3,
tempMon->Print();
}
- // RemoveGeoManager();
+ RemoveGeoManager();
}
--
GitLab