diff --git a/macro/L1/rec.C b/macro/L1/rec.C
index 5db0398442c0882429e1ac66d50e5ba05ad72861..d0e3c1e7f4fed437c08e659c1203691c8d26a075 100644
--- a/macro/L1/rec.C
+++ b/macro/L1/rec.C
@@ -68,7 +68,7 @@ void rec()
// Kalman Filter
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/analysis/flow/anaFlow.C b/macro/analysis/flow/anaFlow.C
index e5052dfec45345a5ff771e6ab72fd9814c3bae9d..95c6cd3297e15f2780d46b491d3e9e4673dc2613 100644
--- a/macro/analysis/flow/anaFlow.C
+++ b/macro/analysis/flow/anaFlow.C
@@ -129,7 +129,7 @@ void anaFlow(Int_t mode = 7, Double_t En = 10., Int_t nEvents = 200, Int_t fileN
anaFlow->setFileName_gen(infilename_gen);
//=== important for reco info -> STS mult
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
@@ -169,7 +169,7 @@ void anaFlow(Int_t mode = 7, Double_t En = 10., Int_t nEvents = 200, Int_t fileN
fRun->SetOutputFile(outfilename);
//=== important for extrapolation to PV -> B-field
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/analysis/flow/eventPlane.C b/macro/analysis/flow/eventPlane.C
index cd3ce0e7c5e2bc7efffa4a102af009974899d5b5..b471c4b031e585482fe16f08523fa613be5bbe15 100644
--- a/macro/analysis/flow/eventPlane.C
+++ b/macro/analysis/flow/eventPlane.C
@@ -89,7 +89,7 @@ void eventPlane(Double_t En = 10, Int_t nEvents = 2, Int_t fQcorr = 0, Int_t fBa
fRun->SetOutputFile(outfilename);
//=== important for extrapolation to PV in B-field
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/analysis/opencharm/PairSelection.C b/macro/analysis/opencharm/PairSelection.C
index 19a423fc7ac3d3aecad7e6942533157dac01f193..7e710ce4b01a05956742f20480b1d812066047ac 100644
--- a/macro/analysis/opencharm/PairSelection.C
+++ b/macro/analysis/opencharm/PairSelection.C
@@ -155,7 +155,7 @@ void PairSelection(Int_t nEvents = 10, Int_t ProcID = 1, bool PileUp = false, In
fRun->SetOutputFile(outFile);
// -------------------------------------------------------------------------
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/analysis/opencharm/PairSelectionSE.C b/macro/analysis/opencharm/PairSelectionSE.C
index d84503c7e88b35317be898942348fc1cf221a2ec..0a5cf9e15aa9db7122da3ce104b9855ea08b5938 100644
--- a/macro/analysis/opencharm/PairSelectionSE.C
+++ b/macro/analysis/opencharm/PairSelectionSE.C
@@ -153,7 +153,7 @@ void PairSelectionSE(Int_t nEvents = 10, Int_t ProcID = 1, bool PileUp = false,
fRun->SetOutputFile(outFile);
// -------------------------------------------------------------------------
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/analysis/opencharm/TrackSelection.C b/macro/analysis/opencharm/TrackSelection.C
index 45b8b877c194f07764663f10f007c79213ba8c21..e96ec41296c4afb5bbdc87f18e3db1941053c24b 100644
--- a/macro/analysis/opencharm/TrackSelection.C
+++ b/macro/analysis/opencharm/TrackSelection.C
@@ -121,7 +121,7 @@ void TrackSelection(Int_t nEvents = 10, Int_t ProcID = 1, bool PileUp = false, I
fRun->AddFriend(rcFile);
fRun->SetOutputFile(outFile);
// ========================================================================
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
+ fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* KF = new CbmKF();
fRun->AddTask(KF);
diff --git a/macro/tof/beamtime/feb15/ana_hits.C b/macro/tof/beamtime/feb15/ana_hits.C
index e0e3be16a580d105b23f5224c7d0d8e9659dc27f..81d22e8eeaded357d7fc668b750c49d779d56810 100644
--- a/macro/tof/beamtime/feb15/ana_hits.C
+++ b/macro/tof/beamtime/feb15/ana_hits.C
@@ -88,7 +88,6 @@ void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/feb15/dis_hits.C b/macro/tof/beamtime/feb15/dis_hits.C
index 007f0169a30645f0fcad42ebd420636dd84f2a34..3b5c306da17d9b2b048938e42f8545c2dfb07e60 100644
--- a/macro/tof/beamtime/feb15/dis_hits.C
+++ b/macro/tof/beamtime/feb15/dis_hits.C
@@ -85,7 +85,6 @@ void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/lab16/ana_hits_nh.C b/macro/tof/beamtime/lab16/ana_hits_nh.C
index 6b7b895be030ab88b9bbe3c047324b8c4e52e1c2..4e9ef51ec7ddc57469bb51778f5f874d2b524197 100644
--- a/macro/tof/beamtime/lab16/ana_hits_nh.C
+++ b/macro/tof/beamtime/lab16/ana_hits_nh.C
@@ -98,7 +98,6 @@ void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// =========================================================================
/*
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder= new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/lab16/dis_digi.C b/macro/tof/beamtime/lab16/dis_digi.C
index 509ccfc40d150f62f33680cdabe5be895aaae6b3..911fa3649878920181ec770930085f83c3fcc532 100644
--- a/macro/tof/beamtime/lab16/dis_digi.C
+++ b/macro/tof/beamtime/lab16/dis_digi.C
@@ -230,7 +230,6 @@ void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/lab16/dis_hits.C b/macro/tof/beamtime/lab16/dis_hits.C
index b8851ca2114fff24ecae662bfb42526076bf78e4..3faccbb0d559e2bc22e6f04992091ec81138f9f7 100644
--- a/macro/tof/beamtime/lab16/dis_hits.C
+++ b/macro/tof/beamtime/lab16/dis_hits.C
@@ -84,7 +84,6 @@ void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/nov15/ana_hits.C b/macro/tof/beamtime/nov15/ana_hits.C
index 2eda248438cb405f69e8adba5d35dc47fd2c0985..d9e0cdd1778241663cc93ec6c9ba484daac55656 100644
--- a/macro/tof/beamtime/nov15/ana_hits.C
+++ b/macro/tof/beamtime/nov15/ana_hits.C
@@ -92,7 +92,6 @@ void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, TString cFi
// =========================================================================
/*
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder= new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/nov15/ana_trks.C b/macro/tof/beamtime/nov15/ana_trks.C
index a35ded74d9ea390962d440091265f5df57c38e9c..fecef6fa338f07505b65f43390284be4bda77c6f 100644
--- a/macro/tof/beamtime/nov15/ana_trks.C
+++ b/macro/tof/beamtime/nov15/ana_trks.C
@@ -91,7 +91,6 @@ void ana_trks(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/nov15/dis_digi.C b/macro/tof/beamtime/nov15/dis_digi.C
index c94687847d552a9458f86307e5ca138d1ee22caa..6e1926302beff752f988dde9b639c836b5913c07 100644
--- a/macro/tof/beamtime/nov15/dis_digi.C
+++ b/macro/tof/beamtime/nov15/dis_digi.C
@@ -230,7 +230,6 @@ void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/beamtime/nov15/dis_hits.C b/macro/tof/beamtime/nov15/dis_hits.C
index 00dffdfd8057d54707b3d58c3cbd214defe1c7c3..b8e548f95e72ddea02076654be27efd27ccf40e8 100644
--- a/macro/tof/beamtime/nov15/dis_hits.C
+++ b/macro/tof/beamtime/nov15/dis_hits.C
@@ -84,7 +84,6 @@ void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFile
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- run->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();
diff --git a/macro/tof/tof_ana_Testbeam.C b/macro/tof/tof_ana_Testbeam.C
index d0725250567c86e195236f38819794a6913c2456..c4e0af64147f213a0fa5c7ae72b5e039490bfd21 100644
--- a/macro/tof/tof_ana_Testbeam.C
+++ b/macro/tof/tof_ana_Testbeam.C
@@ -51,7 +51,6 @@ void tof_ana_Testbeam(Int_t nEvents = 1000, Int_t iSel = 1, Int_t iGenCor = 1, I
// === Tracking ===
// =========================================================================
CbmStsDigitize* stsDigitize = new CbmStsDigitize(); //necessary for kalman !!
- fRun->AddTask(new CbmTrackingDetectorInterfaceInit());
CbmKF* kalman = new CbmKF();
CbmTofTrackFinder* tofTrackFinder = new CbmTofTrackFinderNN();