From a10c1c2a3c9ffd93603a3fb272c5ee2a8a58124c Mon Sep 17 00:00:00 2001 From: jgrosseo Date: Thu, 3 May 2012 07:29:32 +0000 Subject: [PATCH] reverting 56154 and 56161 - does not compile --- PWGCF/Correlations/JCORRAN/AliJCORRANTask.h | 15 ++-- PWGCF/Correlations/JCORRAN/AliJConst.h | 4 +- .../Correlations/JCORRAN/AliJEventHeader.cxx | 4 - PWGCF/Correlations/JCORRAN/AliJEventHeader.h | 4 - PWGCF/Correlations/JCORRAN/AliJPhoton.cxx | 17 +---- PWGCF/Correlations/JCORRAN/AliJPhoton.h | 75 +++++++++---------- PWGCF/Correlations/JCORRAN/AliJRunHeader.cxx | 21 +++--- PWGCF/Correlations/JCORRAN/AliJRunHeader.h | 32 ++++++-- 8 files changed, 78 insertions(+), 94 deletions(-) diff --git a/PWGCF/Correlations/JCORRAN/AliJCORRANTask.h b/PWGCF/Correlations/JCORRAN/AliJCORRANTask.h index 61a26bfdda2..e3e9df485ba 100755 --- a/PWGCF/Correlations/JCORRAN/AliJCORRANTask.h +++ b/PWGCF/Correlations/JCORRAN/AliJCORRANTask.h @@ -33,7 +33,6 @@ #include "AliJConst.h" #include "AliESDpid.h" #include "AliEMCALGeometry.h" -#include "AliEMCALRecoUtils.h" #include "AliPHOSGeoUtils.h" #include "AliPIDResponse.h" #include "AliPIDCombined.h" @@ -101,18 +100,15 @@ class AliJCORRANTask : public AliAnalysisTaskSE { // methods to read data from ESD void ReadESDTracks(AliESDEvent* esd); void ReadESDCaloClusters(const AliESDEvent* esd); - void ReadESDCaloCells(const AliESDEvent* esd); void ReadESDHeader(AliESDEvent* esd); void ReadESDPID(AliESDtrack* track, AliJTrack* ctrack); // methods to read data from AOD void ReadAODTracks(const AliAODEvent* aod); void ReadAODCaloClusters(const AliAODEvent* aod); - void ReadAODCaloCells(const AliAODEvent* aod); void ReadAODHeader(AliAODEvent* aod); void ReadFilter(); void ReadMCTracks(AliMCEvent* fMC); - Int_t GetSuperModuleNumber(bool isemcal, AliVCluster *cluster, AliVCaloCells *cells, Int_t absId); - Double_t* GetCellsAmplitude( bool isemcal, AliVCluster *cluster, AliVCaloCells *emCells, AliVCaloCells *phoCells ); + Int_t GetSuperModuleNumber(bool isemcal, Int_t absId); UInt_t ConvertTriggerMask();//Converts alice trigger mask to JCorran trigger mask //functions used for event selction: @@ -121,6 +117,8 @@ class AliJCORRANTask : public AliAnalysisTaskSE { const char* GetOADBPath() const { return fOADBPath.Data(); } // method to fill jcorran + bool SetAliceTriggerDef(AliJRunHeader *runHeader); + bool SetAliceFilterMapDef(AliJRunHeader *runHeader); //TODO Check void PrintOut(); // UTILS @@ -138,16 +136,16 @@ class AliJCORRANTask : public AliAnalysisTaskSE { bool fStoreEventPlaneSource; bool fStoreTPCTrack; TString fOADBPath; - TRefArray *fCaloClustersArr; + // jcorran output objects TClonesArray * fTrackList; // list of charged track objects TClonesArray * fMCTrackList; // list of charged track objects TClonesArray * fPhotonList; // list of photons objects - TClonesArray * fCaloCellList; // list of calo cells TClonesArray * fHeaderList; // event details TList * fRunInfoList; // run details + AliESDpid *fPIDesd; AliPIDResponse *fPIDResponse; // PID response object AliPIDCombined *fPIDCombined; @@ -157,8 +155,7 @@ class AliJCORRANTask : public AliAnalysisTaskSE { AliESDZDC* fZDCData; AliJRunHeader* fAliRunHeader;// run details (mg field, trigger mask,etc...) - AliEMCALGeometry * fEMCALGeometry; - AliEMCALRecoUtils * fEMCALRecoUtils; + AliEMCALGeometry * fEMCALGeoUtils; // no AliEMCALGeoUtils.h in trunk aliroot (111130) AliPHOSGeoUtils * fPHOSGeom; //phos geometry matrix diff --git a/PWGCF/Correlations/JCORRAN/AliJConst.h b/PWGCF/Correlations/JCORRAN/AliJConst.h index 8727ff4168f..970540273eb 100755 --- a/PWGCF/Correlations/JCORRAN/AliJConst.h +++ b/PWGCF/Correlations/JCORRAN/AliJConst.h @@ -52,9 +52,7 @@ const char* const kParticleProtoType[kNumberOfExperiments][kNumberOfParticleType //=======================JCorran trigger table definition=========================== //internal JCorran trigger mask TBit=0 is MinBias, TBit=1 HighMultiplicityTrigger -enum TriggerBitJCorran {kMinBiasTriggerBitJCorran, kHighMultTriggerBitJCorran, - kEmc0TriggerBitJCorran, - kEmc1GammaTriggerBitJCorran, kEmc1JetTriggerBitJCorran}; +enum TriggerBitJCorran {kMinBiasTriggerBitJCorran, kHighMultTriggerBitJCorran}; const int kRangeTriggerTableAlice = 50; const int kRangeTriggerTableJCorran = 16; diff --git a/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx b/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx index a96a56674ad..665da4b7858 100755 --- a/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx +++ b/PWGCF/Correlations/JCORRAN/AliJEventHeader.cxx @@ -40,7 +40,6 @@ AliJEventHeader::AliJEventHeader(): fSPDTrackletMult(-999), fV0Mult(-999), fEventType(0), - fFiredTriggers(), fVtxMult(-9999) //FK// EFF { // default constructor @@ -59,7 +58,6 @@ AliJEventHeader::AliJEventHeader(int eventid, float cent, float vrtz, ULong64_t fSPDTrackletMult(refmult), fV0Mult(v0mult), fEventType(eventType), - fFiredTriggers(), fVtxMult(-9999) //FK// EFF { //constructor @@ -74,7 +72,6 @@ AliJEventHeader::AliJEventHeader(const AliJEventHeader& a): fSPDTrackletMult(a.fSPDTrackletMult), fV0Mult(a.fV0Mult), fEventType(a.fEventType), - fFiredTriggers(a.fFiredTriggers), fVtxMult(a.fVtxMult) //FK// EFF { //copy constructor @@ -92,7 +89,6 @@ AliJEventHeader& AliJEventHeader::operator=(const AliJEventHeader& header){ fV0Mult = header.fV0Mult; fEventType = header.fEventType; fVtxMult = header.fVtxMult; //FK// EFF - fFiredTriggers = header.fFiredTriggers; for( int i=0;i=0 && i < fNCells ) return fCellsAbsId[i]; else return -1;} Double32_t *GetCellsAmplitudeFraction() const {return fCellsAmpFraction;} - Double32_t GetCellAmplitudeFraction(Int_t i) const { + Double_t GetCellAmplitudeFraction(Int_t i) const { if (fCellsAmpFraction && i >=0 && i < fNCells ) return fCellsAmpFraction[i]; else return -1;} -// Double32_t *GetCellsAmplitude() const {return fCellsAmp;} -// Double32_t GetCellAmplitude(Int_t i) const { -// if (fCellsAmp && i >=0 && i < fNCells ) return fCellsAmp[i]; -// else return -1;} particleType GetParticleType(); Int_t GetSuperModuleID() const { return fSuperModuleId; } void SetSuperModuleID(Int_t id) { fSuperModuleId = id; } @@ -102,18 +97,17 @@ class AliJPhoton : public AliJBaseTrack { //setters void SetCaloType(AliJCaloType calo) {fCaloType = calo;} - void SetDistToBadChannel(Double32_t dist) {fDistToBadChannel = dist;} - void SetDispersion(Double32_t disp) {fDispersion = disp;} - void SetM20(Double32_t m20) {fM20 = m20;} - void SetM02(Double32_t m02) {fM02 = m02;} - void SetEmcCpvDist(Double32_t dist) {fEmcCpvDist = dist;} - void SetPID(const Double32_t *pid); + void SetDistToBadChannel(Double_t dist) {fDistToBadChannel = dist;} + void SetDispersion(Double_t disp) {fDispersion = disp;} + void SetM20(Double_t m20) {fM20 = m20;} + void SetM02(Double_t m02) {fM02 = m02;} + void SetEmcCpvDist(Double_t dist) {fEmcCpvDist = dist;} + void SetPID(const Double_t *pid); void SetNCells(Int_t n) { fNCells = n;} void SetCellsAbsId(const UShort_t *array); void SetCellsAmplitudeFraction(const Double32_t *array); -// void SetCellsAmplitude(const Double32_t *array); - void SetTrackDx(Double32_t trackDx) {fTrackDx = trackDx;} - void SetTrackDz(Double32_t trackDz) {fTrackDz = trackDz;} + void SetTrackDx(Double_t trackDx) {fTrackDx = trackDx;} + void SetTrackDz(Double_t trackDz) {fTrackDz = trackDz;} private: @@ -125,18 +119,17 @@ class AliJPhoton : public AliJBaseTrack { //TODO AliJCaloType fCaloType; // PHOS or EMCAL photon - Double32_t fCaloPID[kUnknownAli+1]; // [0.,1.,8] pointer to PID object - Double32_t fDistToBadChannel; // Distance to nearest bad channel - Double32_t fDispersion; // cluster dispersion, for shape analysis - Double32_t fM20; // 2-nd moment along the main eigen axis - Double32_t fM02; // 2-nd moment along the second eigen axis - Double32_t fEmcCpvDist; // the distance from PHOS EMC rec.point to the closest CPV rec.point + Double_t fCaloPID[kUnknownAli+1]; // [0.,1.,8] pointer to PID object + Double_t fDistToBadChannel; // Distance to nearest bad channel + Double_t fDispersion; // cluster dispersion, for shape analysis + Double_t fM20; // 2-nd moment along the main eigen axis + Double_t fM02; // 2-nd moment along the second eigen axis + Double_t fEmcCpvDist; // the distance from PHOS EMC rec.point to the closest CPV rec.point Int_t fNCells ; //number of cells Int_t fSuperModuleId ; //super module id UShort_t *fCellsAbsId; //[fNCells] array of cell absId numbers - Double32_t *fCellsAmpFraction; //[fNCells][0.,1.,16] array with cell amplitudes fraction (elements are 0 if unfolding off) -// Double32_t *fCellsAmp; //[fNCells] array amplitudes of cluster cells + Double32_t *fCellsAmpFraction; //[fNCells][0.,1.,16] array with cell amplitudes fraction. ClassDef(AliJPhoton,1) diff --git a/PWGCF/Correlations/JCORRAN/AliJRunHeader.cxx b/PWGCF/Correlations/JCORRAN/AliJRunHeader.cxx index e2dafd34ebb..073baeb3a57 100755 --- a/PWGCF/Correlations/JCORRAN/AliJRunHeader.cxx +++ b/PWGCF/Correlations/JCORRAN/AliJRunHeader.cxx @@ -41,11 +41,11 @@ AliJRunHeader::AliJRunHeader(): fL3MagnetPolarity(0), fMagneticFieldL3(0), fActiveTriggersAlice(), - fFiredTriggers(), - fTriggerMask(0), - fTriggerCluster(0), fSizeOfTableJCorran(0), - fActiveTriggersJCorran() +// fAliceTriggerDef(), + fActiveTriggersJCorran(), + fAliceTriggerDef(), + fAliceFilterMapDef() { //constructor for(Int_t i=0;i& GetAliceTriggerDef() const { return fAliceTriggerDef; } + ULong64_t GetAliceTriggerDef( const TString name ) const { return GetBitMaskDef( fAliceTriggerDef, name); } + void AddAliceTriggerDef( const TString name, const ULong64_t mask){ fAliceTriggerDef[name]=mask; } + void RemoveAliceTriggerDef( const TString name){ fAliceTriggerDef.erase(name); } + + //--- Alice track FilterMap by BS like "kEsdTrackCutsL" + const std::map& GetAliceFilterMapDef() const { return fAliceFilterMapDef; } + ULong64_t GetAliceFilterMapDef( const TString name ) const { return GetBitMaskDef( fAliceFilterMapDef, name); } + void AddAliceFilterMapDef( const TString name, const ULong64_t mask){ fAliceFilterMapDef[name]=mask; } + void RemoveAliceFilterMapDef( const TString name){ fAliceFilterMapDef.erase(name); } + + //--- Common Method to handle BitMask Definition ( map ) + ULong64_t GetBitMaskDef( std::map def, const TString name ) const{ + std::map::iterator _iter = def.find(name); + //iter = def.find(name); + if( _iter == def.end() ){ return 0; } + else{ return _iter->second; } + } + //-- Alice trigger table -- by Filip. "Trigger Class" like "+CMBACS2-B-NOPF-ALL" void SetActiveTriggersAlice( const TString *triggers); Int_t GetActiveTriggerBitAlice(TString TriggerName); @@ -82,15 +102,15 @@ class AliJRunHeader : public TNamed { Double32_t fMagneticFieldL3; //Solenoid Magnetic Field in kG TObjArray fActiveTriggersAlice; //array maping between trigger bit and trigger names - // AOD - TString fFiredTriggers; // String with fired triggers - ULong64_t fTriggerMask; // Trigger Type (mask) - UChar_t fTriggerCluster; // Trigger cluster (mask) - - Int_t fSizeOfTableJCorran; //size of jcorran table +// std::map fAliceTriggerDef; //Alice event trigger definition by BS like "kMB", "kHighMulti" +// std::map fAliceFilterMapDef;//Alice track FilterMap by BS like "kEsdTrackCutsL" + TObjArray fActiveTriggersJCorran; //array maping between trigger bit and trigger names //TBit 0 = MB + std::map fAliceTriggerDef; //Alice event trigger definition by BS like "kMB", "kHighMulti" + std::map fAliceFilterMapDef;//Alice track FilterMap by BS like "kEsdTrackCutsL" + //std::map::iterator iter; ClassDef(AliJRunHeader,2) }; -- 2.43.0