Compilation on Windows/Cygwin

[u/mrichter/AliRoot.git] / MUON / AliMUONReconstructor.cxx

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 5ad4de38e18ab820a81ab1e7bc3c86113906e5dd..0948e4fe1e3ad04b0db173073be7ede215b2a5d8 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -104,7 +104,6 @@
 #include "AliMUONSimpleClusterServer.h"
 #include "AliMUONTracker.h"
 #include "AliMUONTriggerCircuit.h"
-#include "AliMUONTriggerCrateStore.h"
 #include "AliMUONTriggerStoreV1.h"
 #include "AliMUONVClusterFinder.h"
 #include "AliMUONVClusterServer.h"
@@ -135,7 +134,6 @@ AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction par
 //_____________________________________________________________________________
 AliMUONReconstructor::AliMUONReconstructor() : 
 AliReconstructor(),
-fCrateManager(0x0),
 fDigitMaker(0x0),
 fTransformer(new AliMUONGeometryTransformer()),
 fDigitStore(0x0),
@@ -144,7 +142,8 @@ fCalibrationData(0x0),
 fDigitCalibrator(0x0),
 fClusterServer(0x0),
 fTriggerStore(0x0),
-fTrackStore(0x0)
+fTrackStore(0x0),
+fClusterStore(0x0)
 {
   /// normal ctor
 
@@ -165,13 +164,13 @@ AliMUONReconstructor::~AliMUONReconstructor()
   delete fDigitMaker;
   delete fDigitStore;
   delete fTransformer;
-  delete fCrateManager;
   delete fTriggerCircuit;
   delete fCalibrationData;
   delete fDigitCalibrator;
   delete fClusterServer;
   delete fTriggerStore;
   delete fTrackStore;
+  delete fClusterStore;
 }
 
 //_____________________________________________________________________________
@@ -179,24 +178,10 @@ const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam()
 {
   /// get reconstruction parameters
   
+  // initialize reconstruction parameters if not already done
   if (!fgRecoParam) {
-    
-    // get reconstruction parameters from AliRecoParam if any
-    TObjArray *recoParams = AliRecoParam::Instance()->GetRecoParam("MUON");
-    
-    if (recoParams) {
-      
-      fgRecoParam = (AliMUONRecoParam*) recoParams->Last();
-      
-    } else {
-      
-      // initialize reconstruction parameters if not already done
-      cout<<"W-AliMUONReconstructor::GetRecoParam: Reconstruction parameters not initialized - Use default one"<<endl;
-      fgRecoParam = AliMUONRecoParam::GetLowFluxParam();
-      AliRecoParam::Instance()->RegisterRecoParam(fgRecoParam);
-      
-    }
-    
+    cout<<"W-AliMUONReconstructor::GetRecoParam: Reconstruction parameters not initialized - Use default one"<<endl;
+    fgRecoParam = AliMUONRecoParam::GetLowFluxParam();
   }
   
   return fgRecoParam;
@@ -261,17 +246,6 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree)
   }
 }
 
-//_____________________________________________________________________________
-AliMUONTriggerCrateStore*
-AliMUONReconstructor::CrateManager() const
-{
-  /// Return (and create if necessary) the trigger crate store
-  if (fCrateManager) return fCrateManager;
-  fCrateManager = new AliMUONTriggerCrateStore;
-  fCrateManager->ReadFromFile();
-  return fCrateManager;
-}
-
 //_____________________________________________________________________________
 void
 AliMUONReconstructor::CreateDigitMaker() const
@@ -482,7 +456,7 @@ AliMUONReconstructor::CreateCalibrator() const
 
   TString calibMode = GetRecoParam()->GetCalibrationMode();
 
-  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,calibMode.Data());
+  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data());
 }
 
 //_____________________________________________________________________________
@@ -545,11 +519,12 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     }
   }
 
-  AliMUONVClusterStore* clusterStore(0x0);
-  
   if ( !alone )
   {
-    clusterStore = new AliMUONClusterStoreV2;
+    if (!fClusterStore)
+    {
+      fClusterStore = new AliMUONClusterStoreV2;
+    }
     
     CreateClusterServer();
     
@@ -564,19 +539,20 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     {
       if (AliMUONReconstructor::GetRecoParam()->UseChamber(i))
       {
-        if ( i >= 6 && AliMUONReconstructor::GetRecoParam()->BypassSt45() ) continue;
+        if ( ( i == 6 || i == 7 )  && AliMUONReconstructor::GetRecoParam()->BypassSt4() ) continue;
+        if ( ( i == 8 || i == 9 )  && AliMUONReconstructor::GetRecoParam()->BypassSt5() ) continue;
         
-        fClusterServer->Clusterize(i,*clusterStore,area);
+        fClusterServer->Clusterize(i,*fClusterStore,area);
       }
     }
     
-    Bool_t cok = clusterStore->Connect(clustersTree,alone);
+    Bool_t cok = fClusterStore->Connect(clustersTree,alone);
     
     if (!cok) AliError("Could not connect clusterStore to clusterTree");
     
-    AliDebug(1,Form("Number of clusters found = %d",clusterStore->GetSize()));
+    AliDebug(1,Form("Number of clusters found = %d",fClusterStore->GetSize()));
     
-    StdoutToAliDebug(1,clusterStore->Print());
+    StdoutToAliDebug(1,fClusterStore->Print());
   }
          
   if (ok) // at least one type of branches created successfully
@@ -584,7 +560,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     clustersTree.Fill();
   }
   
-  delete clusterStore;
+  if (fClusterStore) fClusterStore->Clear();
 }
 
 //_____________________________________________________________________________