From: gconesab Date: Mon, 28 Jun 2010 23:48:05 +0000 (+0000) Subject: Remove dependency on AliRecPoint from AliEMCALGeometry X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=7cfcebd34e4b273b4967c75aba0bb331485d27da Remove dependency on AliRecPoint from AliEMCALGeometry Remove unused methods in AliEMCALGeometry Correct problem that avoided to instantiate twice the geometry : AliEMCALShishKebabTrd1Module In AliEMCALGeoUtils::Impact(TParticle*), if absId >=0 particle is in acceptance, before we excluded 0. --- diff --git a/EMCAL/AliEMCALAodCluster.cxx b/EMCAL/AliEMCALAodCluster.cxx index 21469f0b07b..19504486868 100644 --- a/EMCAL/AliEMCALAodCluster.cxx +++ b/EMCAL/AliEMCALAodCluster.cxx @@ -156,7 +156,6 @@ void AliEMCALAodCluster::EvalPositionAndShowerShape(Float_t logWeight, TString e Int_t nstat = 0; Float_t wtot = 0. ; - Int_t idMax = -1; Int_t iSupMod = -1; Int_t iTower = -1; Int_t iIphi = -1; @@ -180,17 +179,12 @@ void AliEMCALAodCluster::EvalPositionAndShowerShape(Float_t logWeight, TString e if(!emcalgeo) AliFatal("AliEMCALGeometry was not constructed\n") ; - Double_t dist = 0; + Double_t dist = TmaxInCm(Double_t(GetCellAmplitudeFraction(0)),0); for(Int_t iDigit=0; iDigit < GetNCells(); iDigit++) { - if(iDigit==0) { - //Check if this maximum at 0 is true!! - idMax = GetCellAbsId(iDigit); - dist = TmaxInCm(Double_t(GetCellAmplitudeFraction(iDigit)),0); - } - + //Get from the absid the supermodule, tower and eta/phi numbers emcalgeo->GetCellIndex(GetCellAbsId(iDigit),iSupMod,iTower,iIphi,iIeta); - emcalgeo->RelPosCellInSModule(GetCellAbsId(iDigit),idMax, dist, xyzi[0], xyzi[1], xyzi[2]); + emcalgeo->RelPosCellInSModule(GetCellAbsId(iDigit), dist, xyzi[0], xyzi[1], xyzi[2]); emcalgeo->GetCellPhiEtaIndexInSModule(iSupMod,iTower,iIphi,iIeta, iphi,ieta); Double_t ei = GetCellAmplitudeFraction(iDigit) ; diff --git a/EMCAL/AliEMCALGeoUtils.cxx b/EMCAL/AliEMCALGeoUtils.cxx index a7ed1477c74..8653c68a4f9 100644 --- a/EMCAL/AliEMCALGeoUtils.cxx +++ b/EMCAL/AliEMCALGeoUtils.cxx @@ -809,7 +809,7 @@ Bool_t AliEMCALGeoUtils::Impact(const TParticle * particle) const TVector3 vtx(particle->Vx(),particle->Vy(),particle->Vz()); TVector3 vimpact(0,0,0); ImpactOnEmcal(vtx,particle->Theta(),particle->Phi(),absID,vimpact); - if(absID!=0) + if(absID >=0) in=kTRUE; return in; } diff --git a/EMCAL/AliEMCALGeometry.cxx b/EMCAL/AliEMCALGeometry.cxx index 7e8bb2ab358..ddd23f24866 100644 --- a/EMCAL/AliEMCALGeometry.cxx +++ b/EMCAL/AliEMCALGeometry.cxx @@ -203,119 +203,114 @@ Bool_t AliEMCALGeometry::RelPosCellInSModule(Int_t absId, Double_t distEff, Doub return kTRUE; } +//Not in use, comment for the moment //________________________________________________________________________________________________ -Bool_t AliEMCALGeometry::RelPosCellInSModule(Int_t absId, Int_t maxAbsId, Double_t distEff, Double_t &xr, Double_t &yr, Double_t &zr) const -{ - // Jul 31, 2007 - taking into account position of shower max and apply coor2. - // Look to see what the relative - // position inside a given cell is - // for a recpoint. - // In: - // absId - cell is as in Geant, 0<= absId < fNCells; - // maxAbsId - abs id of cell with highest energy - // e - cluster energy - // OUT: - // xr,yr,zr - x,y,z coordinates of cell with absId inside SM - - // Shift index taking into account the difference between standard SM - // and SM of half size in phi direction - const Int_t kphiIndexShift = fCentersOfCellsPhiDir.GetSize()/4; // Nov 22, 2006; was 6 for cas 2X2 - static Int_t nSupMod, nModule, nIphi, nIeta, iphi, ieta; - static Int_t iphim, ietam; - static AliEMCALShishKebabTrd1Module *mod = 0; - static TVector2 v; - - static Int_t nSupModM, nModuleM, nIphiM, nIetaM, iphiM, ietaM; - static Int_t iphimM, ietamM, maxAbsIdCopy=-1; - static AliEMCALShishKebabTrd1Module *modM = 0; - static Double_t distCorr; - - if(!CheckAbsCellId(absId)) return kFALSE; - - GetCellIndex(absId, nSupMod, nModule, nIphi, nIeta); - GetModulePhiEtaIndexInSModule(nSupMod, nModule, iphim, ietam); - GetCellPhiEtaIndexInSModule(nSupMod,nModule,nIphi,nIeta, iphi, ieta); - - //Get eta position. Careful with ALICE conventions (increase index decrease eta) - if(nSupMod%2 == 0) { - ietam = (fCentersOfCellsEtaDir.GetSize()/2-1)-ietam;// 23-ietam, revert the ordering on A side in order to keep convention. - if(nIeta == 0) nIeta = 1; - else nIeta = 0; - } - - mod = GetShishKebabModule(ietam); - - if(absId != maxAbsId) { - distCorr = 0.; - if(maxAbsIdCopy != maxAbsId) { - GetCellIndex(maxAbsId, nSupModM, nModuleM, nIphiM, nIetaM); - GetModulePhiEtaIndexInSModule(nSupModM, nModuleM, iphimM, ietamM); - GetCellPhiEtaIndexInSModule(nSupModM,nModuleM,nIphiM,nIetaM, iphiM, ietaM); - //Careful with ALICE conventions (increase index decrease eta) - if(nSupModM%2 == 0) { - ietamM = (fCentersOfCellsEtaDir.GetSize()/2-1)-ietamM;// 47-ietam, revert the ordering on A side in order to keep convention. - } - - modM = GetShishKebabModule(ietamM); // do I need this ? - maxAbsIdCopy = maxAbsId; - } - - if(ietamM !=0) { - distCorr = fEMCGeometry->GetEtaModuleSize()*(ietam-ietamM)/TMath::Tan(modM->GetTheta()); // Stay here - //printf(" distCorr %f | dist %f | ietam %i -> etamM %i\n", distCorr, dist, ietam, ietamM); - } - // distEff += distCorr; - } - // Bad resolution in this case, strong bias vs phi - // distEff = 0.0; - mod->GetPositionAtCenterCellLine(nIeta, distEff, v); // Stay here - xr = v.Y() - fParSM[0]; - zr = v.X() - fParSM[2]; - - //Get phi position. Careful with ALICE conventions (increase index increase phi) - Int_t iphi2 = iphi; - if(nSupMod<10) { - if(nSupMod%2 != 0) - iphi2 = (fCentersOfCellsPhiDir.GetSize()-1)-iphi;// 23-iphi, revert the ordering on C side in order to keep convention. - yr = fCentersOfCellsPhiDir.At(iphi2); - - } else { - if(nSupMod%2 != 0) - iphi2 = (fCentersOfCellsPhiDir.GetSize()/2-1)-iphi;// 11-iphi, revert the ordering on C side in order to keep convention. - yr = fCentersOfCellsPhiDir.At(iphi2 + kphiIndexShift); - } - AliDebug(1,Form("absId %i nSupMod %i iphi %i ieta %i xr %f yr %f zr %f ",absId,nSupMod,iphi,ieta,xr,yr,zr)); - - return kTRUE; -} - +//Bool_t AliEMCALGeometry::RelPosCellInSModule(Int_t absId, Int_t maxAbsId, Double_t distEff, Double_t &xr, Double_t &yr, Double_t &zr) const +//{ +// // Jul 31, 2007 - taking into account position of shower max and apply coor2. +// // Look to see what the relative +// // position inside a given cell is +// // for a recpoint. +// // In: +// // absId - cell is as in Geant, 0<= absId < fNCells; +// // maxAbsId - abs id of cell with highest energy +// // e - cluster energy +// // OUT: +// // xr,yr,zr - x,y,z coordinates of cell with absId inside SM +// +// // Shift index taking into account the difference between standard SM +// // and SM of half size in phi direction +// const Int_t kphiIndexShift = fCentersOfCellsPhiDir.GetSize()/4; // Nov 22, 2006; was 6 for cas 2X2 +// static Int_t nSupMod, nModule, nIphi, nIeta, iphi, ieta; +// static Int_t iphim, ietam; +// static AliEMCALShishKebabTrd1Module *mod = 0; +// static TVector2 v; +// +// static Int_t nSupModM, nModuleM, nIphiM, nIetaM, iphiM, ietaM; +// static Int_t iphimM, ietamM, maxAbsIdCopy=-1; +// static AliEMCALShishKebabTrd1Module *modM = 0; +// static Double_t distCorr; +// +// if(!CheckAbsCellId(absId)) return kFALSE; +// +// GetCellIndex(absId, nSupMod, nModule, nIphi, nIeta); +// GetModulePhiEtaIndexInSModule(nSupMod, nModule, iphim, ietam); +// GetCellPhiEtaIndexInSModule(nSupMod,nModule,nIphi,nIeta, iphi, ieta); +// +// //Get eta position. Careful with ALICE conventions (increase index decrease eta) +// if(nSupMod%2 == 0) { +// ietam = (fCentersOfCellsEtaDir.GetSize()/2-1)-ietam;// 23-ietam, revert the ordering on A side in order to keep convention. +// if(nIeta == 0) nIeta = 1; +// else nIeta = 0; +// } +// +// mod = GetShishKebabModule(ietam); +// +// if(absId != maxAbsId) { +// distCorr = 0.; +// if(maxAbsIdCopy != maxAbsId) { +// GetCellIndex(maxAbsId, nSupModM, nModuleM, nIphiM, nIetaM); +// GetModulePhiEtaIndexInSModule(nSupModM, nModuleM, iphimM, ietamM); +// GetCellPhiEtaIndexInSModule(nSupModM,nModuleM,nIphiM,nIetaM, iphiM, ietaM); +// //Careful with ALICE conventions (increase index decrease eta) +// if(nSupModM%2 == 0) { +// ietamM = (fCentersOfCellsEtaDir.GetSize()/2-1)-ietamM;// 47-ietam, revert the ordering on A side in order to keep convention. +// } +// +// modM = GetShishKebabModule(ietamM); // do I need this ? +// maxAbsIdCopy = maxAbsId; +// } +// +// if(ietamM !=0) { +// distCorr = fEMCGeometry->GetEtaModuleSize()*(ietam-ietamM)/TMath::Tan(modM->GetTheta()); // Stay here +// //printf(" distCorr %f | dist %f | ietam %i -> etamM %i\n", distCorr, dist, ietam, ietamM); +// } +// // distEff += distCorr; +// } +// // Bad resolution in this case, strong bias vs phi +// // distEff = 0.0; +// mod->GetPositionAtCenterCellLine(nIeta, distEff, v); // Stay here +// xr = v.Y() - fParSM[0]; +// zr = v.X() - fParSM[2]; +// +// //Get phi position. Careful with ALICE conventions (increase index increase phi) +// Int_t iphi2 = iphi; +// if(nSupMod<10) { +// if(nSupMod%2 != 0) +// iphi2 = (fCentersOfCellsPhiDir.GetSize()-1)-iphi;// 23-iphi, revert the ordering on C side in order to keep convention. +// yr = fCentersOfCellsPhiDir.At(iphi2); +// +// } else { +// if(nSupMod%2 != 0) +// iphi2 = (fCentersOfCellsPhiDir.GetSize()/2-1)-iphi;// 11-iphi, revert the ordering on C side in order to keep convention. +// yr = fCentersOfCellsPhiDir.At(iphi2 + kphiIndexShift); +// } +// AliDebug(1,Form("absId %i nSupMod %i iphi %i ieta %i xr %f yr %f zr %f ",absId,nSupMod,iphi,ieta,xr,yr,zr)); +// +// return kTRUE; +//} +// // // == Shish-kebab cases == // - -//____________________________________________________________________________ -void AliEMCALGeometry::GetGlobal(const AliRecPoint* /*rp*/, TVector3& /* vglob */) const -{ - AliFatal(Form("Please use GetGlobalEMCAL(recPoint,gpos) instead of GetGlobal!")); -} - -//_________________________________________________________________________________ -void AliEMCALGeometry::GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 &vglob) const -{ - // Figure out the global numbering - // of a given supermodule from the - // local numbering for RecPoints - - static TVector3 vloc; - static Int_t nSupMod, nModule, nIphi, nIeta; - - const AliEMCALRecPoint *rpTmp = rp; - const AliEMCALRecPoint *rpEmc = rpTmp; - - GetCellIndex(rpEmc->GetAbsId(0), nSupMod, nModule, nIphi, nIeta); - rpTmp->GetLocalPosition(vloc); - GetGlobal(vloc, vglob, nSupMod); -} +// +////_________________________________________________________________________________ +//void AliEMCALGeometry::GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 &vglob) const +//{ +// // Figure out the global numbering +// // of a given supermodule from the +// // local numbering for RecPoints +// +// static TVector3 vloc; +// static Int_t nSupMod, nModule, nIphi, nIeta; +// +// const AliEMCALRecPoint *rpTmp = rp; +// const AliEMCALRecPoint *rpEmc = rpTmp; +// +// GetCellIndex(rpEmc->GetAbsId(0), nSupMod, nModule, nIphi, nIeta); +// rpTmp->GetLocalPosition(vloc); +// GetGlobal(vloc, vglob, nSupMod); +//} diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h index 65ee775a3eb..4673f9b8013 100644 --- a/EMCAL/AliEMCALGeometry.h +++ b/EMCAL/AliEMCALGeometry.h @@ -24,8 +24,8 @@ class TVector3; // --- AliRoot header files --- #include "AliEMCALGeoUtils.h" #include "AliEMCALEMCGeometry.h" -class AliRecPoint; -class AliEMCALRecPoint; +//class AliRecPoint; +//class AliEMCALRecPoint; class AliEMCALGeometry : public AliEMCALGeoUtils { @@ -56,12 +56,11 @@ public: // using AliEMCALGeoUtils::GetGlobal; - virtual void GetGlobal(const AliRecPoint *rp, TVector3 &vglob) const; - virtual void GetGlobal(const AliRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) - const {GetGlobal(rp,gpos); } - virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 &vglob) const; - virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) - const {GetGlobalEMCAL(rp,gpos); } +// virtual void GetGlobal(const AliRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) +// const {GetGlobal(rp,gpos); } +// virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 &vglob) const; +// virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) +// const {GetGlobalEMCAL(rp,gpos); } // Return EMC geometry parameters AliEMCALEMCGeometry * GetEMCGeometry() const {return fEMCGeometry ;} @@ -131,9 +130,11 @@ public: // Methods for AliEMCALRecPoint with taking into account energy of rec.point - Jul 30. 2007 using AliEMCALGeoUtils::RelPosCellInSModule; Bool_t RelPosCellInSModule(Int_t absId,Double_t distEff,Double_t &xr,Double_t &yr, - Double_t & zr) const; - Bool_t RelPosCellInSModule(Int_t absId,Int_t maxAbsId,Double_t distEff,Double_t &xr, - Double_t &yr,Double_t &zr) const; + Double_t & zr) const; + + //Not in use, comment for the moment + //Bool_t RelPosCellInSModule(Int_t absId,Int_t maxAbsId,Double_t distEff,Double_t &xr, + // Double_t &yr,Double_t &zr) const; /////////////////////////////// //Geometry data member setters diff --git a/EMCAL/AliEMCALRecPoint.cxx b/EMCAL/AliEMCALRecPoint.cxx index 86d28f7637d..a31a838be44 100644 --- a/EMCAL/AliEMCALRecPoint.cxx +++ b/EMCAL/AliEMCALRecPoint.cxx @@ -1197,16 +1197,16 @@ void AliEMCALRecPoint::GetGlobalPosition(TVector3 & gpos) const } //____________________________________________________________________________ -void AliEMCALRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const -{ - // returns the position of the cluster in the global reference system of ALICE - // These are now the Cartesian X, Y and Z - // cout<<" geom "<GetGlobalEMCAL(this, gpos, gmat); - -} +//void AliEMCALRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const +//{ +// // returns the position of the cluster in the global reference system of ALICE +// // These are now the Cartesian X, Y and Z +// // cout<<" geom "<GetGlobalEMCAL(this, gpos, gmat); +// +//} //_____________________________________________________________________________ void AliEMCALRecPoint::EvalLocal2TrackingCSTransform() @@ -1229,8 +1229,10 @@ void AliEMCALRecPoint::EvalLocal2TrackingCSTransform() SetX(txyz[0]); SetY(txyz[1]); SetZ(txyz[2]); if(AliLog::GetGlobalDebugLevel()>0) { - TVector3 gpos; TMatrixF gmat; - GetGlobalPosition(gpos,gmat); + TVector3 gpos; //TMatrixF gmat; + //GetGlobalPosition(gpos,gmat); //Not doing anythin special, replace by next line. + fGeomPtr->GetGlobal(fLocPos, gpos, GetSuperModuleNumber()); + Float_t gxyz[3]; GetGlobalXYZ(gxyz); AliInfo(Form("lCS-->(%.3f,%.3f,%.3f), tCS-->(%.3f,%.3f,%.3f), gCS-->(%.3f,%.3f,%.3f), gCScalc-\ diff --git a/EMCAL/AliEMCALRecPoint.h b/EMCAL/AliEMCALRecPoint.h index 8b0e0a541c2..401db18963b 100644 --- a/EMCAL/AliEMCALRecPoint.h +++ b/EMCAL/AliEMCALRecPoint.h @@ -75,7 +75,7 @@ class AliEMCALRecPoint : public AliCluster { Bool_t EvalLocalPositionFromDigits(TClonesArray *digits, TArrayD &ed, TVector3 &locPos); static void GetDeffW0(const Double_t esum, Double_t &deff, Double_t &w0); - virtual void GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const; // return global position (x, y, z) in ALICE + //virtual void GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const; // return global position (x, y, z) in ALICE virtual void GetGlobalPosition(TVector3 & gpos) const; // return global position (x, y, z) in ALICE virtual void GetLocalPosition(TVector3 & lpos) const; // return local position (x, y, z) in EMCAL SM virtual Int_t * GetPrimaries(Int_t & number) const {number = fMulTrack ; diff --git a/EMCAL/AliEMCALShishKebabTrd1Module.cxx b/EMCAL/AliEMCALShishKebabTrd1Module.cxx index cae81c39cfa..31e7b31c60c 100644 --- a/EMCAL/AliEMCALShishKebabTrd1Module.cxx +++ b/EMCAL/AliEMCALShishKebabTrd1Module.cxx @@ -32,7 +32,7 @@ ClassImp(AliEMCALShishKebabTrd1Module) - AliEMCALEMCGeometry *AliEMCALShishKebabTrd1Module::fgGeometry=0; + //AliEMCALEMCGeometry *AliEMCALShishKebabTrd1Module::fgGeometry=0; Double_t AliEMCALShishKebabTrd1Module::fga=0.; Double_t AliEMCALShishKebabTrd1Module::fga2=0.; Double_t AliEMCALShishKebabTrd1Module::fgb=0.; @@ -43,6 +43,7 @@ ClassImp(AliEMCALShishKebabTrd1Module) //_____________________________________________________________________________ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(Double_t theta, AliEMCALEMCGeometry *g) : TNamed(), + fGeometry(g), fOK(), fA(0.), fB(0.), @@ -60,13 +61,10 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(Double_t theta, AliEM fORT() { // theta in radians ; first object shold be with theta=pi/2. - if(fgGeometry==0) { - fTheta = TMath::PiOver2(); - fgGeometry = g; - if(GetParameters()) { - DefineFirstModule(); - } - } else Warning("AliEMCALShishKebabTrd1Module(theta)","You should call this constractor just once !!"); + fTheta = TMath::PiOver2(); + if(GetParameters()) { + DefineFirstModule(); + } DefineName(fTheta); AliDebug(1,Form("AliEMCALShishKebabTrd1Module - first module: theta %1.4f geometry %s",fTheta,g->GetName())); } @@ -74,6 +72,7 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(Double_t theta, AliEM //_____________________________________________________________________________ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(AliEMCALShishKebabTrd1Module &leftNeighbor) : TNamed(), + fGeometry(leftNeighbor.fGeometry), fOK(), fA(0.), fB(0.), @@ -101,6 +100,7 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(AliEMCALShishKebabTrd //________________________________________________________________ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(const AliEMCALShishKebabTrd1Module& mod) : TNamed(mod.GetName(),mod.GetTitle()), + fGeometry(mod.fGeometry), fOK(mod.fOK), fA(mod.fA), fB(mod.fB), @@ -226,23 +226,23 @@ Bool_t AliEMCALShishKebabTrd1Module::GetParameters() { // Get needing module parameters from EMCAL geometry - TString sn(fgGeometry->GetName()); // 2-Feb-05 + TString sn(fGeometry->GetName()); // 2-Feb-05 sn.ToUpper(); - if(!fgGeometry) { + if(!fGeometry) { Warning("GetParameters()"," No geometry "); return kFALSE; } - fga = (Double_t)fgGeometry->GetEtaModuleSize(); - fgb = (Double_t)fgGeometry->GetLongModuleSize(); - fgangle = Double_t(fgGeometry->GetTrd1Angle())*TMath::DegToRad(); + fga = (Double_t)fGeometry->GetEtaModuleSize(); + fgb = (Double_t)fGeometry->GetLongModuleSize(); + fgangle = Double_t(fGeometry->GetTrd1Angle())*TMath::DegToRad(); fgtanBetta = TMath::Tan(fgangle/2.); - fgr = (Double_t)fgGeometry->GetIPDistance(); + fgr = (Double_t)fGeometry->GetIPDistance(); - fgr += fgGeometry->GetSteelFrontThickness(); + fgr += fGeometry->GetSteelFrontThickness(); - fga2 = Double_t(fgGeometry->Get2Trd1Dx2()); + fga2 = Double_t(fGeometry->Get2Trd1Dx2()); //PH PrintShish(0); return kTRUE; } diff --git a/EMCAL/AliEMCALShishKebabTrd1Module.h b/EMCAL/AliEMCALShishKebabTrd1Module.h index c428328006a..c8a0c959946 100644 --- a/EMCAL/AliEMCALShishKebabTrd1Module.h +++ b/EMCAL/AliEMCALShishKebabTrd1Module.h @@ -88,7 +88,7 @@ class AliEMCALShishKebabTrd1Module : public TNamed { protected: // geometry info - static AliEMCALEMCGeometry *fgGeometry; //! + AliEMCALEMCGeometry *fGeometry; //! static Double_t fga; // 2*dx1=2*dy1 static Double_t fga2; // 2*dx2 static Double_t fgb; // 2*dz1 @@ -118,7 +118,7 @@ class AliEMCALShishKebabTrd1Module : public TNamed { TVector2 fORB; // position of right/bottom point of module TVector2 fORT; // position of right/top point of module // public: - ClassDef(AliEMCALShishKebabTrd1Module, 4) // TRD1 Shish-Kebab module + ClassDef(AliEMCALShishKebabTrd1Module, 5) // TRD1 Shish-Kebab module }; #endif