From 0f3849162ebe40e7f1471674d7acb5e067d45b6c Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 16 Dec 2020 13:38:55 +0100
Subject: [PATCH] Remove obsolete parameter file from macro

The parameter file with the tof geometry information isn't needed any longer.
The information is now extracted from the TGeoManger during task initilization.
---
 macro/mcbm/eventDisplay_reco.C     | 5 -----
 macro/mcbm/mcbm_display_event.C    | 5 -----
 macro/mcbm/mcbm_qa.C               | 7 +------
 macro/mcbm/mcbm_reco.C             | 5 -----
 macro/mcbm/mcbm_reco_dev.C         | 5 -----
 macro/mcbm/mcbm_reco_event.C       | 5 -----
 macro/mcbm/mcbm_reco_event_tb.C    | 5 -----
 macro/mcbm/mcbm_reco_event_tb_nh.C | 5 -----
 macro/mcbm/mcbm_reco_gp.C          | 5 -----
 macro/mcbm/mcbm_reco_nh.C          | 5 -----
 macro/run/run_qa.C                 | 5 -----
 macro/run/run_reco.C               | 5 -----
 macro/run/run_reco_event.C         | 5 -----
 macro/run/run_reco_event_qa.C      | 5 -----
 macro/run/run_reco_new.C           | 5 -----
 15 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/macro/mcbm/eventDisplay_reco.C b/macro/mcbm/eventDisplay_reco.C
index 6ed4e48b32..f08a85822f 100644
--- a/macro/mcbm/eventDisplay_reco.C
+++ b/macro/mcbm/eventDisplay_reco.C
@@ -79,11 +79,6 @@ void eventDisplay_reco(TString cSys          = "lam",
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_display_event.C b/macro/mcbm/mcbm_display_event.C
index 37820ba6ff..5867254a97 100644
--- a/macro/mcbm/mcbm_display_event.C
+++ b/macro/mcbm/mcbm_display_event.C
@@ -73,11 +73,6 @@ void mcbm_display_event(Int_t nEvents         = 3,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index da953d9e82..0cd5a718d6 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -69,7 +69,7 @@ void mcbm_qa(Int_t nEvents   = 0,
 
   // -----   Parameter files as input to the runtime database   -------------
   std::cout << std::endl;
-  std::cout << "-I- " << myName << ": Defining parameter files " << std::endl;
+  std::cout << "-I- " << myName << ": Defining paramete files " << std::endl;
   TList* parFileList = new TList();
   TString geoTag;
 
@@ -101,11 +101,6 @@ void mcbm_qa(Int_t nEvents   = 0,
 
   // - TOF digitisation parameters
   if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco.C b/macro/mcbm/mcbm_reco.C
index 77cddb07c7..7fe51d802c 100644
--- a/macro/mcbm/mcbm_reco.C
+++ b/macro/mcbm/mcbm_reco.C
@@ -89,11 +89,6 @@ void mcbm_reco(Int_t nEvents         = 2,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_dev.C b/macro/mcbm/mcbm_reco_dev.C
index 2efaecbc95..508f3f4669 100644
--- a/macro/mcbm/mcbm_reco_dev.C
+++ b/macro/mcbm/mcbm_reco_dev.C
@@ -97,11 +97,6 @@ void mcbm_reco_dev(Int_t nEvents         = 2,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index f14e1ad9fc..ef58d26f1b 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -70,11 +70,6 @@ void mcbm_reco_event(Int_t nEvents         = 3,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_event_tb.C b/macro/mcbm/mcbm_reco_event_tb.C
index 4156c44da4..facddd7cae 100644
--- a/macro/mcbm/mcbm_reco_event_tb.C
+++ b/macro/mcbm/mcbm_reco_event_tb.C
@@ -77,11 +77,6 @@ void mcbm_reco_event_tb(Int_t nEvents         = 10,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_event_tb_nh.C b/macro/mcbm/mcbm_reco_event_tb_nh.C
index 5e7b931eb2..7d181efb9f 100644
--- a/macro/mcbm/mcbm_reco_event_tb_nh.C
+++ b/macro/mcbm/mcbm_reco_event_tb_nh.C
@@ -93,11 +93,6 @@ void mcbm_reco_event_tb_nh(
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_gp.C b/macro/mcbm/mcbm_reco_gp.C
index c5ddc3ec40..e63d0266bb 100644
--- a/macro/mcbm/mcbm_reco_gp.C
+++ b/macro/mcbm/mcbm_reco_gp.C
@@ -98,11 +98,6 @@ void mcbm_reco_gp(
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/mcbm/mcbm_reco_nh.C b/macro/mcbm/mcbm_reco_nh.C
index aa0f72f654..8bd1666b8e 100644
--- a/macro/mcbm/mcbm_reco_nh.C
+++ b/macro/mcbm/mcbm_reco_nh.C
@@ -81,11 +81,6 @@ void mcbm_reco_nh(Int_t nEvents         = 1000,
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C
index acdd0c755d..d0104352c3 100644
--- a/macro/run/run_qa.C
+++ b/macro/run/run_qa.C
@@ -103,11 +103,6 @@ void run_qa(Int_t nEvents   = 0,
 
   // - TOF digitisation parameters
   if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C
index c642f66a6c..0721d9c62d 100644
--- a/macro/run/run_reco.C
+++ b/macro/run/run_reco.C
@@ -155,11 +155,6 @@ void run_reco(TString input        = "",
 
   // - TOF digitisation parameters
   if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/run/run_reco_event.C b/macro/run/run_reco_event.C
index 40db0ad9e9..ed211decde 100644
--- a/macro/run/run_reco_event.C
+++ b/macro/run/run_reco_event.C
@@ -92,11 +92,6 @@ void run_reco_event(Int_t nEvents   = 2,
 
   // - TOF digitisation parameters
   if (CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/run/run_reco_event_qa.C b/macro/run/run_reco_event_qa.C
index 023b597890..23e8701974 100644
--- a/macro/run/run_reco_event_qa.C
+++ b/macro/run/run_reco_event_qa.C
@@ -72,11 +72,6 @@ void run_reco_event_qa(Int_t nEvents   = 2,
 
   // - TOF digitisation parameters
   if (CbmSetup::Instance()->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
diff --git a/macro/run/run_reco_new.C b/macro/run/run_reco_new.C
index 9b63e87f52..fe2d12b605 100644
--- a/macro/run/run_reco_new.C
+++ b/macro/run/run_reco_new.C
@@ -75,11 +75,6 @@ void run_reco_new(
 
   // - TOF digitisation parameters
   if (setup->GetGeoTag(kTof, geoTag)) {
-    TObjString* tofFile =
-      new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digi.par");
-    parFileList->Add(tofFile);
-    std::cout << "-I- " << myName << ": Using parameter file "
-              << tofFile->GetString() << std::endl;
     TObjString* tofBdfFile =
       new TObjString(srcDir + "/parameters/tof/tof_" + geoTag + ".digibdf.par");
     parFileList->Add(tofBdfFile);
-- 
GitLab