diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 0c9428d13dde7468d40191a3b22f4c020d91ae33..5ff0c1deb43177a1eabcf7a32958e62635bf0d4b 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -17,7 +17,7 @@
 // --------------------------------------------------------------------------
 
 
-void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test", const char* setupName = "mcbm_beam_2022_03")
+void mcbm_reco_event(Int_t nEvents = 100, TString dataset = "data/test", const char* setupName = "mcbm_beam_2022_03")
 {
   // ========================================================================
   //          Adjust this part according to your requirements
@@ -358,73 +358,72 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test", const ch
 
   // ------------------------------------------------------------------------
   // --------   L1 CA Track Finder    ---------------------------------------
-  if (strcmp(setupName, "mcbm_beam_2021_07_surveyed") == 0) {
-    CbmKF* kalman = new CbmKF();
-    run->AddTask(kalman);
-    CbmL1* l1 = new CbmL1();
-    l1->SetLegacyEventMode(1);
-    l1->SetMcbmMode();
-    l1->SetUseHitErrors(1);
-    if (strcmp(setupName, "mcbm_beam_2021_07_surveyed") == 0) l1->SetMissingHits(1);
-
-    // --- Material budget file names
-    TString mvdGeoTag;
-    if (setup->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
-      TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
-      std::cout << "Using material budget file " << parFile << std::endl;
-      l1->SetMvdMaterialBudgetFileName(parFile.Data());
-    }
-    TString stsGeoTag;
-    if (setup->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
-      TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/sts/sts_matbudget_v19a.root";
-      std::cout << "Using material budget file " << parFile << std::endl;
-      l1->SetStsMaterialBudgetFileName(parFile.Data());
-    }
 
-    TString muchGeoTag;
-    if (setup->GetGeoTag(ECbmModuleId::kMuch, muchGeoTag)) {
+  CbmKF* kalman = new CbmKF();
+  run->AddTask(kalman);
+  CbmL1* l1 = new CbmL1();
+  l1->SetLegacyEventMode(1);
+  l1->SetMcbmMode();
+  l1->SetUseHitErrors(1);
+  if (strcmp(setupName, "mcbm_beam_2021_07_surveyed") == 0) l1->SetMissingHits(1);
+
+  // --- Material budget file names
+  TString mvdGeoTag;
+  if (setup->GetGeoTag(ECbmModuleId::kMvd, mvdGeoTag)) {
+    TString parFile = gSystem->Getenv("VMCWORKDIR");
+    parFile         = parFile + "/parameters/mvd/mvd_matbudget_" + mvdGeoTag + ".root";
+    std::cout << "Using material budget file " << parFile << std::endl;
+    l1->SetMvdMaterialBudgetFileName(parFile.Data());
+  }
+  TString stsGeoTag;
+  if (setup->GetGeoTag(ECbmModuleId::kSts, stsGeoTag)) {
+    TString parFile = gSystem->Getenv("VMCWORKDIR");
+    parFile         = parFile + "/parameters/sts/sts_matbudget_v19a.root";
+    std::cout << "Using material budget file " << parFile << std::endl;
+    l1->SetStsMaterialBudgetFileName(parFile.Data());
+  }
 
-      // --- Parameter file name
-      TString geoTag;
-      setup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
-      Int_t muchFlag = 0;
-      if (geoTag.Contains("mcbm")) muchFlag = 1;
+  TString muchGeoTag;
+  if (setup->GetGeoTag(ECbmModuleId::kMuch, muchGeoTag)) {
 
-      TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/much/much_" + geoTag(0, 4) + "_digi_sector.root";
-      std::cout << "L1: Using parameter file " << parFile << std::endl;
-      l1->SetMuchPar(parFile);
+    // --- Parameter file name
+    TString geoTag;
+    setup->GetGeoTag(ECbmModuleId::kMuch, geoTag);
+    Int_t muchFlag = 0;
+    if (geoTag.Contains("mcbm")) muchFlag = 1;
 
-      TString parFile2 = gSystem->Getenv("VMCWORKDIR");
-      parFile2         = parFile2 + "/parameters/much/much_matbudget_" + geoTag + ".root ";
-      std::cout << "Using material budget file " << parFile2 << std::endl;
-      l1->SetMuchMaterialBudgetFileName(parFile2.Data());
-    }
+    TString parFile = gSystem->Getenv("VMCWORKDIR");
+    parFile         = parFile + "/parameters/much/much_" + geoTag(0, 4) + "_digi_sector.root";
+    std::cout << "L1: Using parameter file " << parFile << std::endl;
+    l1->SetMuchPar(parFile);
+
+    TString parFile2 = gSystem->Getenv("VMCWORKDIR");
+    parFile2         = parFile2 + "/parameters/much/much_matbudget_" + geoTag + ".root ";
+    std::cout << "Using material budget file " << parFile2 << std::endl;
+    l1->SetMuchMaterialBudgetFileName(parFile2.Data());
+  }
 
-    TString trdGeoTag;
-    if (setup->GetGeoTag(ECbmModuleId::kTrd, trdGeoTag)) {
-      TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/trd/trd_matbudget_" + trdGeoTag + ".root ";
-      std::cout << "Using material budget file " << parFile << std::endl;
-      l1->SetTrdMaterialBudgetFileName(parFile.Data());
-    }
+  TString trdGeoTag;
+  if (setup->GetGeoTag(ECbmModuleId::kTrd, trdGeoTag)) {
+    TString parFile = gSystem->Getenv("VMCWORKDIR");
+    parFile         = parFile + "/parameters/trd/trd_matbudget_" + trdGeoTag + ".root ";
+    std::cout << "Using material budget file " << parFile << std::endl;
+    l1->SetTrdMaterialBudgetFileName(parFile.Data());
+  }
 
-    TString tofGeoTag;
-    if (setup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
-      TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";
-      std::cout << "Using material budget file " << parFile << std::endl;
-      l1->SetTofMaterialBudgetFileName(parFile.Data());
-    }
+  TString tofGeoTag;
+  if (setup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
+    TString parFile = gSystem->Getenv("VMCWORKDIR");
+    parFile         = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";
+    std::cout << "Using material budget file " << parFile << std::endl;
+    l1->SetTofMaterialBudgetFileName(parFile.Data());
+  }
 
-    run->AddTask(l1);
+  run->AddTask(l1);
 
-    CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
-    FairTask* globalFindTracks                = new CbmL1GlobalFindTracksEvents(globalTrackFinder);
-    run->AddTask(globalFindTracks);
-  }
+  CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
+  FairTask* globalFindTracks                = new CbmL1GlobalFindTracksEvents(globalTrackFinder);
+  run->AddTask(globalFindTracks);
 
 
   // -----  Parameter database   --------------------------------------------
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 3bbf2302bfdeab590a6f0f9118479715771782d6..75ef4b77aebc678068517145abadfafea07bf6c4 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -406,8 +406,8 @@ InitStatus CbmL1::Init()
 
   vector<float> TofStationZ;
   vector<int> TofStationN;
-  if (fUseTOF) NTOFStation = fTofDigiBdfPar->GetNbTrackingStations();
-  {
+  if (fUseTOF) {
+    NTOFStation = fTofDigiBdfPar->GetNbTrackingStations();
     TofStationZ.resize(NTOFStation, 0);
     TofStationN.resize(NTOFStation, 0);