From b2d49404ece71d2e1154e9d580ca5140a6fe94d7 Mon Sep 17 00:00:00 2001 From: mcosenti Date: Tue, 13 Mar 2012 17:41:28 +0000 Subject: [PATCH] changing classes names and relinking them --- .../EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx | 56 ++++++++--------- PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h | 62 +++++++++---------- PWGGA/PWGGAEMCALTasksLinkDef.h | 6 ++ 3 files changed, 65 insertions(+), 59 deletions(-) diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx index 3d20029067d..39a623f4498 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx @@ -104,25 +104,25 @@ void AliAnalysisTaskEMCALPhoton::UserCreateOutputObjects() fSelPrimTracks = new TObjArray(); - if (TClass::GetClass("MyHeaderObj")) - TClass::GetClass("MyHeaderObj")->IgnoreTObjectStreamer(); - fHeader = new MyHeaderObj; + if (TClass::GetClass("AliPhotonHeaderObj")) + TClass::GetClass("AliPhotonHeaderObj")->IgnoreTObjectStreamer(); + fHeader = new AliPhotonHeaderObj; - if (TClass::GetClass("MyConversionObj")) - TClass::GetClass("MyConversionObj")->IgnoreTObjectStreamer(); - fPhotConvArray = new TClonesArray("MyConversionObj"); + if (TClass::GetClass("AliPhotonConvObj")) + TClass::GetClass("AliPhotonConvObj")->IgnoreTObjectStreamer(); + fPhotConvArray = new TClonesArray("AliPhotonConvObj"); - if (TClass::GetClass("MyClusterObj")) - TClass::GetClass("MyClusterObj")->IgnoreTObjectStreamer(); - fMyClusts = new TClonesArray("MyClusterObj"); + if (TClass::GetClass("AliPhotonClusterObj")) + TClass::GetClass("AliPhotonClusterObj")->IgnoreTObjectStreamer(); + fMyClusts = new TClonesArray("AliPhotonClusterObj"); - if (TClass::GetClass("MyCellObj")) - TClass::GetClass("MyCellObj")->IgnoreTObjectStreamer(); - fMyCells = new TClonesArray("MyCellObj"); + if (TClass::GetClass("AliPhotonCellObj")) + TClass::GetClass("AliPhotonCellObj")->IgnoreTObjectStreamer(); + fMyCells = new TClonesArray("AliPhotonCellObj"); - if (TClass::GetClass("MyTrackObj")) - TClass::GetClass("MyTrackObj")->IgnoreTObjectStreamer(); - fMyTracks = new TClonesArray("MyTrackObj"); + if (TClass::GetClass("AliPhotonTrackObj")) + TClass::GetClass("AliPhotonTrackObj")->IgnoreTObjectStreamer(); + fMyTracks = new TClonesArray("AliPhotonTrackObj"); if (fClusterizer || fIsTrain){ if(fClusterizer) @@ -133,15 +133,15 @@ void AliAnalysisTaskEMCALPhoton::UserCreateOutputObjects() else fCaloClustersName = "EmcalClustersv2"; } - if (TClass::GetClass("MyClusterObj")) - TClass::GetClass("MyClusterObj")->IgnoreTObjectStreamer(); - fMyAltClusts = new TClonesArray("MyClusterObj"); + if (TClass::GetClass("AliPhotonClusterObj")) + TClass::GetClass("AliPhotonClusterObj")->IgnoreTObjectStreamer(); + fMyAltClusts = new TClonesArray("AliPhotonClusterObj"); } cout<IgnoreTObjectStreamer(); - fMyMcParts = new TClonesArray("MyMcPartObj"); + if (TClass::GetClass("AliPhotonMcPartObj")) + TClass::GetClass("AliPhotonMcPartObj")->IgnoreTObjectStreamer(); + fMyMcParts = new TClonesArray("AliPhotonMcPartObj"); } fCaloClusters = new TRefArray(); @@ -378,7 +378,7 @@ void AliAnalysisTaskEMCALPhoton::FindConversions() vecpos.Phi(); if(v0Phi<0) v0Phi+=TMath::TwoPi(); - MyConversionObj *myconv = static_cast(fPhotConvArray->New(iconv++)); + AliPhotonConvObj *myconv = static_cast(fPhotConvArray->New(iconv++)); myconv->fPt = photLV.Pt(); myconv->fEta = photLV.Eta(); myconv->fPhi = convPhi; @@ -419,7 +419,7 @@ void AliAnalysisTaskEMCALPhoton::FillMyCells() Int_t mcel = 0; for(Int_t icell = 0; icellGetCellNumber(icell)); - MyCellObj *mycell = static_cast(fMyCells->New(mcel++)); + AliPhotonCellObj *mycell = static_cast(fMyCells->New(mcel++)); Float_t eta=-1, phi=-1; if(!fGeom){ cout<<"+++fGeom not found! MyCells branch will not be filled for this event!+++\n"; @@ -457,7 +457,7 @@ void AliAnalysisTaskEMCALPhoton::FillMyClusters() clus->GetPosition(pos); TVector3 cpos(pos); TString cellsAbsID; - MyClusterObj *myclus = static_cast(fMyClusts->New(mcl++)); + AliPhotonClusterObj *myclus = static_cast(fMyClusts->New(mcl++)); myclus->fE = clus->E(); myclus->fEt = clus->E()*TMath::Sin(cpos.Theta()); myclus->fR = cpos.Perp(); @@ -533,7 +533,7 @@ void AliAnalysisTaskEMCALPhoton::FillMyAltClusters() clus->GetPosition(pos); TVector3 cpos(pos); TString cellsAbsID; - MyClusterObj *myclus = static_cast(fMyAltClusts->New(mcl++)); + AliPhotonClusterObj *myclus = static_cast(fMyAltClusts->New(mcl++)); myclus->fE = clus->E(); myclus->fEt = clus->E()*TMath::Sin(cpos.Theta()); myclus->fR = cpos.Perp(); @@ -594,7 +594,7 @@ void AliAnalysisTaskEMCALPhoton::FillHighPtTracks() continue; if(track->Pt()<3) continue; - MyTrackObj *mtr = static_cast(fMyTracks->New(imtr++)); + AliPhotonTrackObj *mtr = static_cast(fMyTracks->New(imtr++)); mtr->fPt = track->Pt(); mtr->fEta = track->Eta(); mtr->fPhi = track->Phi(); @@ -643,7 +643,7 @@ void AliAnalysisTaskEMCALPhoton::GetMcParts() continue; bool checkIfAlreadySaved = false; for(Int_t imy=0;imyGetEntries();imy++){ - MyMcPartObj *mymc = static_cast(fMyMcParts->At(imy)); + AliPhotonMcPartObj *mymc = static_cast(fMyMcParts->At(imy)); if(!mymc) continue; if(mymc->fLabel == iTrack) @@ -671,7 +671,7 @@ void AliAnalysisTaskEMCALPhoton::FillMcPart(TParticle *mcP, Int_t ipart, Int_t if(!mcP) return; TVector3 vmcv(mcP->Vx(),mcP->Vy(), mcP->Vz()); - MyMcPartObj *mcp = static_cast(fMyMcParts->New(ipart)); + AliPhotonMcPartObj *mcp = static_cast(fMyMcParts->New(ipart)); mcp->fLabel = itrack ; mcp->fPdg = mcP->GetPdgCode() ; mcp->fPt = mcP->Pt() ; diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h index c706ac79986..cad941de176 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPhoton.h @@ -14,10 +14,10 @@ class AliEMCALGeometry; class AliVCluster; class AliAnalysisTaskEMCALClusterizeFast; class TParticle; -class MyHeaderObj; -class MyConversionObj; -class MyClusterObj; -class MyCellObj; +class AliPhotonHeaderObj; +class AliPhotonConvObj; +class AliPhotonClusterObj; +class AliPhotonCellObj; #include "AliAnalysisTaskSE.h" @@ -105,13 +105,13 @@ class AliAnalysisTaskEMCALPhoton : public AliAnalysisTaskSE { AliESDtrackCuts *fPrTrCuts; // primary track cuts TObjArray *fSelTracks; //!pointer to selected inclusive tracks TObjArray *fSelPrimTracks; //!pointer to selected primary tracks - TClonesArray *fPhotConvArray; //!array of MyConversionObj - TClonesArray *fMyClusts; //!array of MyClusterObj - TClonesArray *fMyAltClusts; //!array of MyClusterObj from the alternative clusterizer - TClonesArray *fMyCells; //!array of MyCellObj - TClonesArray *fMyTracks; //!array of MyTrackObj - TClonesArray *fMyMcParts; //!array of MyMcPartObj - MyHeaderObj *fHeader; //! + TClonesArray *fPhotConvArray; //!array of AliPhotonConvObj + TClonesArray *fMyClusts; //!array of AliPhotonClusterObj + TClonesArray *fMyAltClusts; //!array of AliPhotonClusterObj from the alternative clusterizer + TClonesArray *fMyCells; //!array of AliPhotonCellObj + TClonesArray *fMyTracks; //!array of AliPhotonTrackObj + TClonesArray *fMyMcParts; //!array of AliPhotonMcPartObj + AliPhotonHeaderObj *fHeader; //! TRefArray *fCaloClusters; //!pointer to EMCal clusters TClonesArray *fCaloClustersNew; //!pointer to EMCal clusters v2 AliESDCaloCells *fEMCalCells; //!pointer to EMCal cells @@ -154,12 +154,12 @@ class AliAnalysisTaskEMCALPhoton : public AliAnalysisTaskSE { #endif -#ifndef MyObjs_h -#define MyObjs_h +#ifndef AliPhotonObjs_h +#define AliPhotonObjs_h -class MyHeaderObj : public TObject +class AliPhotonHeaderObj : public TObject { - public: MyHeaderObj() : + public: AliPhotonHeaderObj() : TObject(), fTrClassMask(0), fTrCluster(0), fV0Cent(0), fV0(0), fCl1Cent(0), fCl1(0), fTrCent(0), fTr(0), fNClus(0), fNCells(0) {;} public: @@ -174,12 +174,12 @@ class MyHeaderObj : public TObject Int_t fNClus; Int_t fNCells; - ClassDef(MyHeaderObj,2) + ClassDef(AliPhotonHeaderObj,2) }; -class MyConversionObj : public TObject +class AliPhotonConvObj : public TObject { - public: MyConversionObj() : + public: AliPhotonConvObj() : TObject(), fPt(0), fEta(0), fPhi(0), fVR(0), fVEta(0), fVPhi(0), fMass(0), fMcLabel(-1), fNegPt(0), fNegEta(0), fNegPhi(0), fNegDedx(0), fNegMcLabel(-1), fPosPt(0), fPosEta(0), fPosPhi(0), fPosDedx(0), fPosMcLabel(-1) {;} @@ -207,12 +207,12 @@ class MyConversionObj : public TObject Double32_t fPosDedx; //[0,0,16] if correctly filled, should be <50 MeV Short_t fPosMcLabel; //corresponding MC label - ClassDef(MyConversionObj,1) // conversion class + ClassDef(AliPhotonConvObj,1) // conversion class }; -class MyClusterObj : public TObject +class AliPhotonClusterObj : public TObject { - public: MyClusterObj() : + public: AliPhotonClusterObj() : TObject(), fE(0), fEt(0), fR(0), fEta(0), fPhi(0), fN(0),fEmax(0),fTmax(0), fIdmax(0), fEcross(0),fDisp(-1), fM20(-1), fM02(-1),fTrDEta(0), fTrDPhi(0), fTrEp(0), fTrDedx(0), fTrIso01(0), fTrIso02(0), fTrIso03(0), fTrIso04(0), fTrPhiBand01(0), fTrPhiBand02(0), fTrPhiBand03(0), fTrPhiBand04(0), fCellsAbsId(""),fMcLabel(-1) @@ -248,13 +248,13 @@ class MyClusterObj : public TObject - ClassDef(MyClusterObj,6) // cluster class + ClassDef(AliPhotonClusterObj,6) // cluster class }; -class MyCellObj : public TObject +class AliPhotonCellObj : public TObject { - public: MyCellObj() : + public: AliPhotonCellObj() : TObject(), fAbsID(-1), fE(0), fEt(0), fEta(0), fPhi(0), fTime(0) {;} public: @@ -267,13 +267,13 @@ class MyCellObj : public TObject - ClassDef(MyCellObj,1) // cell class + ClassDef(AliPhotonCellObj,1) // cell class }; -class MyTrackObj : public TObject +class AliPhotonTrackObj : public TObject { - public: MyTrackObj() : + public: AliPhotonTrackObj() : TObject(), fPt(0), fEta(0), fPhi(0), fDedx(0), fCharge(0), fMcLabel(-1) {;} public: Double32_t fPt; @@ -283,12 +283,12 @@ class MyTrackObj : public TObject Short_t fCharge; Short_t fMcLabel; - ClassDef(MyTrackObj,3) + ClassDef(AliPhotonTrackObj,3) }; -class MyMcPartObj : public TObject +class AliPhotonMcPartObj : public TObject { - public: MyMcPartObj() : + public: AliPhotonMcPartObj() : TObject(), fLabel(-1), fPdg(0), fPt(0), fEta(0), fPhi(0), fVR(0), fVEta(0), fVPhi(0), fMother(-1) {;} public: @@ -302,7 +302,7 @@ class MyMcPartObj : public TObject Double32_t fVPhi; Short_t fMother; - ClassDef(MyMcPartObj,1) + ClassDef(AliPhotonMcPartObj,1) }; #endif diff --git a/PWGGA/PWGGAEMCALTasksLinkDef.h b/PWGGA/PWGGAEMCALTasksLinkDef.h index 0a9834aa730..61484f2fc51 100644 --- a/PWGGA/PWGGAEMCALTasksLinkDef.h +++ b/PWGGA/PWGGAEMCALTasksLinkDef.h @@ -30,5 +30,11 @@ #pragma link C++ class AliStaVertex+; #pragma link C++ class AliAnalysisTaskTrgContam+; #pragma link C++ class AliAnalysisTaskEMCALPhoton+; +#pragma link C++ class AliPhotonHeaderObj+; //stand alone obj for isolated photon analysis +#pragma link C++ class AliPhotonConvObj+; //same as above +#pragma link C++ class AliPhotonClusterObj+; //same as above +#pragma link C++ class AliPhotonCellObj+; //same as above +#pragma link C++ class AliPhotonTrackObj+; //same as above +#pragma link C++ class AliPhotonMcPartObj+; //same as above #endif -- 2.43.0