A few fixes

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

diff --git a/MUON/AliMUONLegacyClusterServer.cxx b/MUON/AliMUONLegacyClusterServer.cxx
index 8ad26ba0fea01b9381cdefd33f8d529d236af00a..5e9ca644a88662736a9bd8e5b8fb0b5b89a5e8a3 100644 (file)
--- a/MUON/AliMUONLegacyClusterServer.cxx
+++ b/MUON/AliMUONLegacyClusterServer.cxx
@@ -37,6 +37,7 @@
 #include "AliMUONTriggerTrackToTrackerClusters.h"
 #include "AliMUONVCluster.h"
 #include "AliMUONVClusterStore.h"
+#include "AliMUONRecoParam.h"
 #include "AliMpArea.h"
 #include <TCollection.h>
 
@@ -45,9 +46,13 @@ ClassImp(AliMUONLegacyClusterServer)
 /// \endcond
 
 //_____________________________________________________________________________
-AliMUONLegacyClusterServer::AliMUONLegacyClusterServer(const AliMUONGeometryTransformer& transformer, AliMUONVClusterStore* store)
-: AliMUONVClusterServer(), fTransformer(transformer), fClusterStore(store), fTriggerTrackStore(0x0),
-fBypass(0x0)
+AliMUONLegacyClusterServer::AliMUONLegacyClusterServer(const AliMUONGeometryTransformer& transformer, 
+                                                                                                                                                                                                                        AliMUONVClusterStore* store,
+                                                                                                                                                                                                                        Bool_t bypassSt4, Bool_t bypassSt5)
+: AliMUONVClusterServer(), fkTransformer(transformer), fClusterStore(store), fTriggerTrackStore(0x0),
+fBypass(0x0),
+fBypassSt4(bypassSt4),
+fBypassSt5(bypassSt5)
 {
   /// ctor. Mode Read : we'll only server clusters from existing store
 }
@@ -63,19 +68,25 @@ AliMUONLegacyClusterServer::~AliMUONLegacyClusterServer()
 Int_t 
 AliMUONLegacyClusterServer::Clusterize(Int_t chamberId, 
                                        AliMUONVClusterStore& clusterStore,
-                                       const AliMpArea& /*area*/)
+                                       const AliMpArea& /*area*/,
+                                       const AliMUONRecoParam* /*recoParam*/)
 {
   /// Fills clusterStore with clusters in given chamber
   ///
   /// Return the number of clusters added to clusterStore
   
-  AliCodeTimerAuto(Form("Chamber %d",chamberId));
+  AliCodeTimerAuto(Form("Chamber %d",chamberId),0);
 
-  if ( fBypass && chamberId >= 6 ) 
+  if ( fBypassSt4 && ( chamberId == 6 || chamberId == 7 ) ) 
   {
     return fBypass->GenerateClusters(chamberId,clusterStore);
   }
-  
+
+       if ( fBypassSt5 && ( chamberId == 8 || chamberId == 9 ) ) 
+  {
+    return fBypass->GenerateClusters(chamberId,clusterStore);
+  }
+       
   AliDebug(1,Form("chamberId=%d fClusterStore(%p).GetSize()=%d clusterStore(%p).GetSize()=%d",
                   chamberId,
                   fClusterStore,fClusterStore->GetSize(),
@@ -108,16 +119,16 @@ AliMUONLegacyClusterServer::Clusterize(Int_t chamberId,
 Bool_t 
 AliMUONLegacyClusterServer::UseTriggerTrackStore(AliMUONVTriggerTrackStore* trackStore)
 {
-  /// Tells us to use trigger track store, and thus to bypass St45 clusters
+  /// Tells us to use trigger track store, and thus to bypass St4 and/or 5 clusters
   fTriggerTrackStore = trackStore; // not owner
   delete fBypass;
-  fBypass = new AliMUONTriggerTrackToTrackerClusters(fTransformer,fTriggerTrackStore);
+  fBypass = new AliMUONTriggerTrackToTrackerClusters(fkTransformer,fTriggerTrackStore);
   return kTRUE;
 }
 
 //_____________________________________________________________________________
 void
-AliMUONLegacyClusterServer::UseDigits(TIter&)
+AliMUONLegacyClusterServer::UseDigits(TIter&, AliMUONVDigitStore*)
 {
   /// Give the iterator to our delegate if we have one, of issue and error