AliCalorimeterUtils: Fix to be able to use PHOS bad map and geometry matrices

[u/mrichter/AliRoot.git] / PWG4 / PartCorrBase / AliMCAnalysisUtils.h

diff --git a/PWG4/PartCorrBase/AliMCAnalysisUtils.h b/PWG4/PartCorrBase/AliMCAnalysisUtils.h
index 55931fcea0a6fba2f145cdeba77ac60aa7845b96..123d8145749f7a982f205a1121bf40e2aadef9e8 100755 (executable)
--- a/PWG4/PartCorrBase/AliMCAnalysisUtils.h
+++ b/PWG4/PartCorrBase/AliMCAnalysisUtils.h
@@ -28,12 +28,7 @@ class AliMCAnalysisUtils : public TObject {
  public: 
   AliMCAnalysisUtils() ; // ctor
   virtual ~AliMCAnalysisUtils() ;//virtual dtor
- private:
-  AliMCAnalysisUtils & operator = (const AliMCAnalysisUtils & ) ;//cpy assignment
-  AliMCAnalysisUtils(const AliMCAnalysisUtils & mcu) ; // cpy ctor
-  
- public:
-  
+    
   //--------------------------------------
   //Enum with tag for origin of particles
   //--------------------------------------
@@ -44,26 +39,28 @@ class AliMCAnalysisUtils : public TObject {
   //come from pi0 decay)                              
   //then charged particles on line 3,                                                                                    
   //followed by other and unknown on line 4                                                                              
-  enum mcTypes { kMCPhoton,   kMCPrompt,      kMCFragmentation, kMCISR,    kMCPi0Decay, kMCEtaDecay, kMCOtherDecay, kMCConversion,
-                kMCElectron, kMCEFromCFromB, kMCEFromC,        kMCEFromB, kMCZDecay,   kMCWDecay,
-                kMCMuon,     kMCPion,        kMCPi0,           kMCKaon,   kMCEta,      kMCProton,   kMCAntiProton, kMCNeutron,    kMCAntiNeutron,
-                kMCOther,    kMCUnknown,     kMCBadLabel                                                                                         } ;
+  enum mcTypes { kMCPhoton,     kMCPrompt,      kMCFragmentation, kMCISR,    
+                 kMCPi0Decay,   kMCEtaDecay,    kMCOtherDecay,    kMCConversion,
+                 kMCElectron,   kMCEFromCFromB, kMCEFromC,        kMCEFromB, kMCZDecay,   kMCWDecay,
+                 kMCMuon,       kMCPion,        kMCPi0,           kMCKaon,   kMCEta,      kMCProton,   
+                 kMCAntiProton, kMCNeutron,     kMCAntiNeutron,
+                 kMCOther,      kMCUnknown,     kMCBadLabel                                                                                         } ;
   
   //--------------------------------------
   // Methods to check origin of clusters
   //--------------------------------------
   
-  Int_t   CheckCommonAncestor(const Int_t index1, const Int_t index2, AliCaloTrackReader* reader, 
+  Int_t   CheckCommonAncestor(const Int_t index1, const Int_t index2, const AliCaloTrackReader* reader, 
                              Int_t & ancPDG, Int_t & ancStatus, TLorentzVector & momentum, TVector3 & v) ;
-  Int_t   CheckOrigin(const Int_t label, AliCaloTrackReader * reader, const Int_t input) ;
+  Int_t   CheckOrigin(const Int_t label, const AliCaloTrackReader * reader, const Int_t input) ;
   //Check the label of the most significant particle but do checks on the rest of the contributing labels
-  Int_t   CheckOrigin(const Int_t *label, const Int_t nlabels, AliCaloTrackReader * reader, const Int_t input) ;
+  Int_t   CheckOrigin(const Int_t *label, const Int_t nlabels, const AliCaloTrackReader * reader, const Int_t input) ;
   
   Int_t   CheckOriginInStack(const Int_t *labels, const Int_t nlabels, AliStack * stack) ;
-  Int_t   CheckOriginInAOD  (const Int_t *labels, const Int_t nlabels, TClonesArray* mcparticles) ;
+  Int_t   CheckOriginInAOD  (const Int_t *labels, const Int_t nlabels, const TClonesArray* mcparticles) ;
   
   void    CheckOverlapped2GammaDecay(const Int_t *labels, const Int_t nlabels, const Int_t mesonIndex, AliStack * stack, Int_t & tag);
-  void    CheckOverlapped2GammaDecay(const Int_t *labels, const Int_t nlabels, const Int_t mesonIndex, TClonesArray* mcparticles, Int_t & tag);
+  void    CheckOverlapped2GammaDecay(const Int_t *labels, const Int_t nlabels, const Int_t mesonIndex, const TClonesArray* mcparticles, Int_t & tag);
   
   //Check or set the bits produced in the above methods
   void    SetTagBit(Int_t &tag, const UInt_t set) const {
@@ -82,7 +79,7 @@ class AliMCAnalysisUtils : public TObject {
   //--------------------------------------
   
   // Method to recover MC jets stored in generator
-  TList * GetJets(AliCaloTrackReader * const reader) ;
+  TList * GetJets(const AliCaloTrackReader * reader) ;
   
   void    SetDebug(Int_t deb)           { fDebug=deb           ; }
   Int_t   GetDebug()              const { return fDebug        ; }     
@@ -98,6 +95,9 @@ class AliMCAnalysisUtils : public TObject {
   TList * fJetsList;            // List of jets
   TString fMCGenerator;         // MC geneator used to generate data in simulation
   
+  AliMCAnalysisUtils & operator = (const AliMCAnalysisUtils & ) ; // cpy assignment
+  AliMCAnalysisUtils(const AliMCAnalysisUtils & mcu) ;            // cpy ctor
+  
   ClassDef(AliMCAnalysisUtils,3)
 
 } ;