Warnings corrected.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 4 Mar 2008 22:41:55 +0000 (22:41 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 4 Mar 2008 22:41:55 +0000 (22:41 +0000)
27 files changed:
JETAN/AliAnalysisTaskJets.cxx
JETAN/AliAnalysisTaskJets.h
JETAN/AliDAJetFinder.cxx
JETAN/AliDAJetFinder.h
JETAN/AliJetAODReader.cxx
JETAN/AliJetAODReader.h
JETAN/AliJetAODReaderHeader.cxx
JETAN/AliJetDummyGeo.h
JETAN/AliJetDummyShishKebabTrd1Module.cxx
JETAN/AliJetDummyShishKebabTrd1Module.h
JETAN/AliJetESDReader.h
JETAN/AliJetESDReaderHeader.cxx
JETAN/AliJetESDmcReader.h
JETAN/AliJetFillUnitArrayEMCalDigits.h
JETAN/AliJetFillUnitArrayTracks.h
JETAN/AliJetFinder.cxx
JETAN/AliJetGrid.cxx
JETAN/AliJetGrid.h
JETAN/AliJetHadronCorrectionv1.cxx
JETAN/AliJetHadronCorrectionv1.h
JETAN/AliJetHistos.h
JETAN/AliJetMCReader.h
JETAN/AliJetReader.cxx
JETAN/AliJetReaderHeader.cxx
JETAN/AliJetUnitArray.h
JETAN/AliUA1JetFinderV1.cxx
JETAN/AliUA1JetFinderV2.cxx

index d41d27b..b350b90 100644 (file)
@@ -102,9 +102,6 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
 // Execute analysis for current event
 //
     
-    if (MCEvent()) {
-       AliStack* stack = MCEvent()->Stack();
-    }
     fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent());
     fJetFinder->ProcessEvent();
 
index c2f900f..7ff8860 100644 (file)
@@ -25,6 +25,9 @@ class AliAnalysisTaskJets : public AliAnalysisTaskSE
     virtual void UserExec(Option_t *option);
     virtual void Terminate(Option_t *option);
     virtual void SetDebugLevel(Int_t level) {fDebug = level;}
+ private:
+  AliAnalysisTaskJets(const AliAnalysisTaskJets &det);
+  AliAnalysisTaskJets &operator=(const AliAnalysisTaskJets &det);
     
  private:
     Int_t         fDebug;        //  Debug flag
index 69f2d35..38e8d1c 100644 (file)
@@ -1,3 +1,4 @@
+
 //  **************************************************************************
 //  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
 //  *                                                                        *
@@ -47,8 +48,7 @@ AliDAJetFinder::AliDAJetFinder():
        fPy(0x0),
        fXEta(0x0),
        fXPhi(0x0),
-       fNin(0),
-       fHeader(0x0)
+       fNin(0)
 {
        // Constructor
 }
@@ -57,7 +57,6 @@ AliDAJetFinder::AliDAJetFinder():
 AliDAJetFinder::~AliDAJetFinder()
 {
        // Destructor
-        delete fHeader;
        delete fPyx;
        delete fY;
        delete fPx;
@@ -99,7 +98,10 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum)
        fBeta=0.1;
        TClonesArray *lvArray = fReader->GetMomentumArray();
        fNin = lvArray->GetEntries();
-       fNclustMax= fHeader->GetFixedCl() ? fHeader->GetNclustMax() : TMath::Max((Int_t)TMath::Sqrt(fNin),5);
+       fNclustMax= ((AliDAJetHeader*)fHeader)->GetFixedCl() ? 
+           ((AliDAJetHeader*)fHeader)->GetNclustMax() 
+           : 
+           TMath::Max((Int_t)TMath::Sqrt(fNin),5);
        fXEta=new Double_t[fNin]; fXPhi=new Double_t[fNin];
        fPx = new TVectorD(fNin);
        for (Int_t iIn=0; iIn<fNin; iIn++){
@@ -151,7 +153,7 @@ void AliDAJetFinder::Annealing(Int_t nk)
        TMatrixD *ry = new TMatrixD(2,nk);
        Double_t Dist(TVectorD,TVectorD);
 
-       Double_t df[2]={fHeader->GetEtaCut(),pi};
+       Double_t df[2]={((AliDAJetHeader*)fHeader)->GetEtaCut(),pi};
        TVectorD vPart(2);
        Double_t *m = new Double_t[nk];
        Double_t chi,chi1;
@@ -368,7 +370,7 @@ void AliDAJetFinder::StoreJets(Int_t nk,Int_t *xx)
 {
 //evaluate significant clusters properties
        const Double_t pi=TMath::Pi();
-       Double_t dMeanDist=TMath::Sqrt(4*fHeader->GetEtaCut()*pi/fNin);
+       Double_t dMeanDist=TMath::Sqrt(4*((AliDAJetHeader*)fHeader)->GetEtaCut()*pi/fNin);
        Bool_t   *isJet = new Bool_t[nk];
        Double_t *etNoBg= new Double_t[nk];
        Double_t *dDeltaEta=new Double_t[nk];
@@ -394,7 +396,7 @@ void AliDAJetFinder::StoreJets(Int_t nk,Int_t *xx)
                etDens[iClust]=(*fY)(3,iClust)/surf[iClust];
        }
 
-       if (fHeader->GetSelJets()){
+       if (((AliDAJetHeader*)fHeader)->GetSelJets()){
                for (Int_t iClust=0; iClust<nk; iClust++){
                        if (!isJet[iClust]){
                                Double_t etDensMed=0.;
@@ -417,7 +419,7 @@ void AliDAJetFinder::StoreJets(Int_t nk,Int_t *xx)
                for (Int_t iClust=0; iClust<nk; iClust++){
                        if (isJet[iClust]){
                                Double_t etDensMed=0;
-                               Double_t extSurf=4*fHeader->GetEtaCut()*pi;
+                               Double_t extSurf=4*((AliDAJetHeader*)fHeader)->GetEtaCut()*pi;
                                for (Int_t iClust1=0; iClust1<nk; iClust1++){
                                        if (!isJet[iClust1]) etDensMed+=(*fY)(3,iClust1);
                                        else extSurf-=surf[iClust1];
index 82a79e4..0baf8f6 100644 (file)
@@ -21,8 +21,6 @@ public:
     virtual  ~AliDAJetFinder();
     
     void FindJets      ();
-    void SetJetHeader  (AliDAJetHeader *h) {fHeader = h;}
-    
  private:
     void InitDetAnn    (Double_t &dEtSum);
     void Annealing     (Int_t nk);
@@ -50,9 +48,6 @@ protected:
     Double_t  *fXEta;                                  // input data eta coordinate
     Double_t  *fXPhi;                                  // input data phi coordinate
     Int_t      fNin;                                   // number of input data
-     
-    AliDAJetHeader *fHeader;                            // the header  
-    
     ClassDef(AliDAJetFinder,1)
 };// 
 #endif
index 054df87..0a2a479 100644 (file)
@@ -122,7 +122,7 @@ void AliJetAODReader::ConnectTree(TTree* tree, TObject* /*data*/) {
 
 //____________________________________________________________________________
 
-Bool_t AliJetAODReader::FillMomentumArray(Int_t /*event*/)
+Bool_t AliJetAODReader::FillMomentumArray()
 {
   // Clear momentum array
   ClearArray();
index 3f9925d..7772fae 100644 (file)
@@ -24,10 +24,13 @@ class AliJetAODReader : public AliJetReader
 
   TRefArray*   GetReferences() const {return fRef;}
 
-  Bool_t FillMomentumArray(Int_t event); 
+  Bool_t FillMomentumArray(); 
   void   OpenInputFiles();
   void   ConnectTree(TTree* tree, TObject* data);
   void   SetInputEvent(TObject* /*esd*/, TObject* aod, TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
+ private:
+  AliJetAODReader(const AliJetAODReader &det);
+  AliJetAODReader &operator=(const AliJetAODReader &det);
 
  private:
   TChain                     *fChain;  //! chain for reconstructed tracks
index 514855d..070b72a 100644 (file)
@@ -26,7 +26,8 @@ ClassImp(AliJetAODReaderHeader)
 //____________________________________________________________________________
 AliJetAODReaderHeader::AliJetAODReaderHeader():
   AliJetReaderHeader("AliJetAODReaderHeader"), 
-  fNaod(0)
+  fNaod(0),
+  fTestFilterMask(0)
 {
   // Default constructor  
 }
index ce5cba5..93adc78 100644 (file)
@@ -83,7 +83,9 @@ class AliJetDummyGeo : public TObject
   Bool_t  GetPhiBoundariesOfSMGap(Int_t nPhiSec, Double_t &phiMin, Double_t &phiMax) const;
   void    GetTransformationForSM();
   Float_t GetSampling() const {return fSampling;}
-
+ private:
+  AliJetDummyGeo &operator=(const AliJetDummyGeo &det);
+  
  protected:
   Float_t fArm1EtaMin;                 // Minimum pseudorapidity position of EMCAL in Eta
   Float_t fArm1EtaMax;                         // Maximum pseudorapidity position of EMCAL in Eta
index 9de2f51..9394ff3 100644 (file)
@@ -110,7 +110,8 @@ AliJetDummyShishKebabTrd1Module::AliJetDummyShishKebabTrd1Module(const AliJetDum
     fOK2(mod.fOK2),
     fOB(mod.fOB),
     fOB1(mod.fOB1),
-    fOB2(mod.fOB2)
+    fOB2(mod.fOB2),
+    fDebug(mod.fDebug)
 {
   //copy ctor
   for (Int_t i=0; i<3; i++) fOK3X3[i] = mod.fOK3X3[i];
index 2b61f7f..7934bea 100644 (file)
@@ -117,8 +117,6 @@ class AliJetDummyShishKebabTrd1Module : public TNamed {
   // 3X3 case - Nov 9,2006
   TVector2 fOK3X3[3];
   Int_t    fDebug;
-
-  // public:
   ClassDef(AliJetDummyShishKebabTrd1Module,1) // TRD1 Shish-Kebab module 
 };
 
index fb4e9bb..1d14954 100755 (executable)
@@ -50,6 +50,9 @@ class AliJetESDReader : public AliJetReader
  private:
   void SetEMCALGeometry();
   void InitParameters();
+  AliJetESDReader(const AliJetESDReader &det);
+  AliJetESDReader &operator=(const AliJetESDReader &det);
+
  protected:
   AliJetDummyGeo             *fGeom;             //! EMCAL Geometry 
   TChain                     *fChain;            //! chain for reconstructed tracks
index 67e0c23..dff7581 100755 (executable)
@@ -26,6 +26,8 @@ ClassImp(AliJetESDReaderHeader)
 //____________________________________________________________________________
 AliJetESDReaderHeader::AliJetESDReaderHeader():
   AliJetReaderHeader("AliJetESDReaderHeader"), 
+  fDCA(0),
+  fTLength(0),
   fReadSignalOnly(kFALSE),
   fReadBkgdOnly(kFALSE),
   fNesd(0)
index 03f9ef2..31969f8 100644 (file)
@@ -20,9 +20,13 @@ class AliJetESDmcReader : public AliJetESDReader
   AliJetESDmcReader();
   virtual ~AliJetESDmcReader();
   // Setters
-  Bool_t FillMomentumArray(Int_t event); 
-  void   OpenInputFiles();
-   
+  Bool_t FillMomentumArray(Int_t event);
+  Bool_t FillMomentumArray() {return kTRUE;}
+    void   OpenInputFiles();
+ private:
+  AliJetESDmcReader(const AliJetESDmcReader &det);
+  AliJetESDmcReader &operator=(const AliJetESDmcReader &det);
+
  protected:
   TChain*    fChainMC;   // chain for mc information
   AliHeader* fAliHeader; //! Event header
index e59332c..7b38307 100644 (file)
@@ -58,6 +58,9 @@ class AliJetFillUnitArrayEMCalDigits : public TTask
   void          Exec(Option_t*);
   Float_t       EtaToTheta(Float_t arg);
  private:
+  AliJetFillUnitArrayEMCalDigits(const AliJetFillUnitArrayEMCalDigits &det);
+  AliJetFillUnitArrayEMCalDigits &operator=(const AliJetFillUnitArrayEMCalDigits &det);
+
   void InitParameters();
 
  protected:
index 7760f25..86f2b9e 100644 (file)
@@ -65,6 +65,9 @@ class AliJetFillUnitArrayTracks : public TTask
   Int_t         GetMult()          const {return fNTracks;}
   Int_t         GetMultCut()       const {return fNTracksCut;}
   void          Exec(Option_t*);
+ private:
+  AliJetFillUnitArrayTracks(const AliJetFillUnitArrayTracks &det);
+  AliJetFillUnitArrayTracks &operator=(const AliJetFillUnitArrayTracks &det);
 
  protected:
   Int_t   fNumUnits;      // Number of units in the unit object array (same as num towers in EMCAL)
index f5df125..0e2f500 100644 (file)
@@ -209,7 +209,6 @@ Bool_t AliJetFinder::ProcessEvent()
 //
 // Process one event
 //
-    Int_t debug  = fReader->GetReaderHeader()->GetDebug();
     Bool_t ok = fReader->FillMomentumArray();
     if (!ok) return kFALSE;
 
index e96a164..55b3022 100644 (file)
@@ -120,26 +120,34 @@ AliJetGrid::AliJetGrid(Int_t nphi,Int_t neta,Double_t phiMin,Double_t phiMax,Dou
 }
 
 //__________________________________________________________
-AliJetGrid::AliJetGrid(const AliJetGrid& grid):TNamed(grid) {
+AliJetGrid::AliJetGrid(const AliJetGrid& grid) : TNamed(grid),
+    fGrid(grid.fGrid),
+    fNphi(grid.fNphi),        
+    fNeta(grid.fNeta),      
+    fPhi(0),       
+    fEta(0),       
+    fIndex(0),     
+    fIndexI(grid.fIndexI),    
+    fIndexJ(grid.fIndexJ),    
+    fPhiMin(grid.fPhiMin),    
+    fPhiMax(grid.fPhiMax),    
+    fEtaMin(grid.fEtaMin),    
+    fEtaMax(grid.fEtaMax),    
+    fEtaBinInTPCAcc(grid.fEtaBinInTPCAcc),   
+    fPhiBinInTPCAcc(grid.fPhiBinInTPCAcc),   
+    fEtaBinInEMCalAcc(grid.fEtaBinInEMCalAcc), 
+    fPhiBinInEMCalAcc(grid.fPhiBinInEMCalAcc), 
+    fNbinEta(grid.fNbinEta),
+    fNbinPhi(grid.fNbinPhi),
+    fMaxPhi(grid.fMaxPhi),
+    fMinPhi(grid.fMinPhi),
+    fMaxEta(grid.fMaxEta),
+    fMinEta(grid.fMinEta),
+    fDebug(grid.fDebug) 
+{
 
   // Copy constructor
 
-  fNphi = grid.fNphi;
-  fNeta = grid.fNeta;
-  fPhiMin = grid.fPhiMin;
-  fPhiMax = grid.fPhiMax;
-  fEtaMin = grid.fEtaMin;
-  fEtaMax = grid.fEtaMax;
-  fEtaBinInTPCAcc = grid.fEtaBinInTPCAcc;
-  fPhiBinInTPCAcc = grid.fPhiBinInTPCAcc;
-  fEtaBinInEMCalAcc = grid.fEtaBinInEMCalAcc;
-  fPhiBinInEMCalAcc = grid.fPhiBinInEMCalAcc;
-  fNbinPhi = grid.fNbinPhi;
-  fMaxPhi = grid.fMaxPhi;
-  fMinPhi = grid.fMinPhi;
-  fMaxEta = grid.fMaxEta;
-  fMinEta = grid.fMinEta;
-
   fPhi = new TArrayD(fNphi+1);
   for(Int_t i=0; i<fNphi+1; i++) (*fPhi)[i] = grid.fPhi->At(i);
   fEta = new TArrayD(fNeta+1);
@@ -151,6 +159,45 @@ AliJetGrid::AliJetGrid(const AliJetGrid& grid):TNamed(grid) {
   }
 }
 
+
+AliJetGrid& AliJetGrid::operator=(const AliJetGrid& other)
+{
+// Assignment
+    fGrid = other.fGrid;
+    fNphi = other.fNphi;        
+    fNeta = other.fNeta;      
+    fPhi    = 0;       
+    fEta    = 0;       
+    fIndex  = 0;     
+    fIndexI = other.fIndexI;    
+    fIndexJ = other.fIndexJ;    
+    fPhiMin = other.fPhiMin;    
+    fPhiMax = other.fPhiMax;    
+    fEtaMin = other.fEtaMin;    
+    fEtaMax = other.fEtaMax;    
+    fEtaBinInTPCAcc   = other.fEtaBinInTPCAcc;   
+    fPhiBinInTPCAcc   = other.fPhiBinInTPCAcc;   
+    fEtaBinInEMCalAcc = other.fEtaBinInEMCalAcc; 
+    fPhiBinInEMCalAcc = other.fPhiBinInEMCalAcc; 
+    fNbinEta = other.fNbinEta;
+    fNbinPhi = other.fNbinPhi;
+    fMaxPhi  = other.fMaxPhi;
+    fMinPhi  = other.fMinPhi;
+    fMaxEta  = other.fMaxEta;
+    fMinEta  = other.fMinEta;
+    fDebug   = other.fDebug;
+    fPhi = new TArrayD(fNphi+1);
+    for(Int_t i=0; i<fNphi+1; i++) (*fPhi)[i] = other.fPhi->At(i);
+    fEta = new TArrayD(fNeta+1);
+    for(Int_t i=0; i<fNeta+1; i++) (*fEta)[i] = other.fEta->At(i);
+    
+    fIndex = new TMatrixD(fNphi+1,fNeta+1);
+    for(Int_t i=0; i<fNphi+1; i++) {
+       for(Int_t j=0; j<fNeta+1; j++) (*fIndex)(i,j)=(*other.fIndex)(i,j);
+    }
+    return *this;
+}
+
 //__________________________________________________________
 AliJetGrid::~AliJetGrid() {
 
index d202ad8..92327c3 100644 (file)
@@ -23,6 +23,7 @@ class AliJetGrid : public TNamed {
   AliJetGrid();
   AliJetGrid(Int_t nphi,Int_t neta,Double_t phiMin,Double_t etaMin,Double_t phiMax,Double_t etaMax);
   AliJetGrid(const AliJetGrid& grid);
+  AliJetGrid& operator=(const AliJetGrid& other);
   virtual ~AliJetGrid();
 
   // Getter
index 5ac309a..920c8b9 100644 (file)
@@ -109,9 +109,15 @@ void AliJetHadronCorrectionv1::SetGeometry(TString name,Double_t fs)
        
 }      
 
+AliJetHadronCorrectionv1::AliJetHadronCorrectionv1() 
+    :AliJetHadronCorrection(), 
+     fSamplingFraction(0)
+{
+}
        
 AliJetHadronCorrectionv1::AliJetHadronCorrectionv1(const char *name,const char *title) 
-                           :AliJetHadronCorrection(name, title)
+    :AliJetHadronCorrection(name, title), 
+     fSamplingFraction(0)
 {
   fgHadrCorr = this;
 }
index 36dc663..448c42b 100644 (file)
@@ -17,7 +17,7 @@ class AliJetDummyGeo;
 class AliJetHadronCorrectionv1 : public AliJetHadronCorrection 
 {
  public:
-    AliJetHadronCorrectionv1(){;}
+    AliJetHadronCorrectionv1();
     static  AliJetHadronCorrectionv1* Instance();
     virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid); 
     Double_t GetEnergy(Double_t pmom, Double_t eta) {return GetEnergy(pmom,eta,7);}
index 75ebfee..17e4be7 100644 (file)
@@ -16,9 +16,11 @@ class AliJetHistos : public TObject {
 
   void AddHistosToList(TList *list);
   void FillHistos(TClonesArray *jets);
-
- protected:
+  
+ private:
   void SetProperties(TH1* h,const char* x, const char* y) const;
+  AliJetHistos(const AliJetHistos &det);
+  AliJetHistos &operator=(const AliJetHistos &det);
  private:
 
   TH1I *fNJetsH;   // distribution of number of jets
index dfa8f53..0510fe5 100644 (file)
@@ -16,9 +16,13 @@ class AliJetMCReader : public AliJetESDReader
     AliJetMCReader();
     virtual ~AliJetMCReader();
     Bool_t FillMomentumArray(Int_t event);
+    Bool_t FillMomentumArray() {return kTRUE;}
+ private:
+  AliJetMCReader(const AliJetMCReader &det);
+  AliJetMCReader &operator=(const AliJetMCReader &det);
     
  protected:
-    TChain* fChainMC;// Input chain
+    TChain* fChainMC; // Input chain
     ClassDef(AliJetMCReader,1)
 };
  
index db62f0f..0c90c95 100755 (executable)
@@ -37,7 +37,6 @@
 ClassImp(AliJetReader)
 
 ////////////////////////////////////////////////////////////////////////
-
 AliJetReader::AliJetReader():
   // Constructor
   fChain(0), 
@@ -53,9 +52,9 @@ AliJetReader::AliJetReader():
   fUnitArrayNoCuts(new TClonesArray("AliJetUnitArray",60000)),
   fArrayInitialised(0),
   fFillUAFromTracks(new AliJetFillUnitArrayTracks()), 
-  fFillUAFromEMCalDigits(new AliJetFillUnitArrayEMCalDigits())
-  //  fHadronCorrector(0),
-  //  fHCorrection(0)
+  fFillUAFromEMCalDigits(new AliJetFillUnitArrayEMCalDigits()),
+  fNumCandidate(0),
+  fNumCandidateCut(0)
 {
   // Default constructor
   fSignalFlag = TArrayI();
index 7642a8d..7d8d74c 100755 (executable)
@@ -32,6 +32,7 @@ AliJetReaderHeader::AliJetReaderHeader():
  fFirst(0),
  fLast(-1),
  fOption(0),
+ fDebug(0),
  fDZ(0),
  fSignalPerBg(0),
  fFiducialEtaMin(-0.9),
@@ -55,6 +56,7 @@ AliJetReaderHeader::AliJetReaderHeader(const char * name):
  fLast(-1),
  fOption(0),
  fDebug(0),
+ fDZ(0),
  fSignalPerBg(0),
  fFiducialEtaMin(-0.9),
  fFiducialEtaMax(0.9),
index 20e810c..d32846e 100644 (file)
@@ -84,6 +84,9 @@ class AliJetUnitArray : public TObject
   Bool_t operator>  ( AliJetUnitArray unit1) const;
   Bool_t operator<  ( AliJetUnitArray unit1) const;
   Bool_t operator== ( AliJetUnitArray unit1) const;
+ private:
+  AliJetUnitArray(const AliJetUnitArray &det);
+  AliJetUnitArray &operator=(const AliJetUnitArray &det);
 
  protected:
   Float_t         fUnitEnergy;                          // Energy of the unit 
index aacda75..fc8e2bb 100644 (file)
 
 ClassImp(AliUA1JetFinderV1)
 
-////////////////////////////////////////////////////////////////////////
-
-AliUA1JetFinderV1::AliUA1JetFinderV1()
+/////////////////////////////////////////////////////////////////////
 
+AliUA1JetFinderV1::AliUA1JetFinderV1() :
+    AliJetFinder(),
+    fLego(0)
 {
   // Constructor
-  fHeader = 0x0;
-  fLego   = 0x0;
 }
 
 ////////////////////////////////////////////////////////////////////////
index 0182689..2cac03a 100644 (file)
@@ -47,13 +47,13 @@ ClassImp(AliUA1JetFinderV2)
 
 ////////////////////////////////////////////////////////////////////////
 
-  AliUA1JetFinderV2::AliUA1JetFinderV2():
+AliUA1JetFinderV2::AliUA1JetFinderV2() :
+    AliJetFinder(),
+    fLego(0),  
     fDebug(0),
     fOpt(0)
 {
   // Constructor
-  fHeader = 0x0;
-  fLego   = 0x0;
 }
 
 ////////////////////////////////////////////////////////////////////////