From 423554a3220dd16760360cd61193475fd4220c2d Mon Sep 17 00:00:00 2001 From: dibari Date: Mon, 23 Apr 2007 13:21:04 +0000 Subject: [PATCH] Coding convention --- HMPID/AliHMPID.cxx | 2 +- HMPID/AliHMPID.h | 8 +++++--- HMPID/AliHMPIDHit.cxx | 7 ++++--- HMPID/AliHMPIDHit.h | 5 ++++- HMPID/AliHMPIDParam.cxx | 12 ++++++------ HMPID/AliHMPIDParam.h | 16 ++++++++-------- HMPID/AliHMPIDPreprocessor.cxx | 16 +++++++++------- HMPID/AliHMPIDPreprocessor.h | 12 ++++++++---- HMPID/AliHMPIDRecon.h | 3 ++- HMPID/AliHMPIDReconstructor.cxx | 6 +++++- HMPID/AliHMPIDReconstructor.h | 4 +++- HMPID/AliHMPIDTracker.cxx | 6 +++++- HMPID/AliHMPIDTracker.h | 8 ++++++-- HMPID/AliHMPIDv0.h | 4 +++- HMPID/AliHMPIDv1.h | 8 +++++--- 15 files changed, 74 insertions(+), 43 deletions(-) diff --git a/HMPID/AliHMPID.cxx b/HMPID/AliHMPID.cxx index 39be890bfd3..223addbc465 100644 --- a/HMPID/AliHMPID.cxx +++ b/HMPID/AliHMPID.cxx @@ -26,7 +26,7 @@ #include //HitQA() #include //in many methods to print AliInfo -Bool_t AliHMPID::fDoFeed=kTRUE; +Bool_t AliHMPID::fgDoFeed=kTRUE; ClassImp(AliHMPID) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/HMPID/AliHMPID.h b/HMPID/AliHMPID.h index 48f16a3d1cf..b648eecb82c 100644 --- a/HMPID/AliHMPID.h +++ b/HMPID/AliHMPID.h @@ -7,7 +7,9 @@ #include //XxxCreate() #include //fDig,fClu field - +//. +//HMPID base class +//. class AliHMPID : public AliDetector //TObject-TNamed-AliModule-AliDetector-AliHMPID { @@ -27,7 +29,7 @@ public: void MakeBranch (Option_t *opt=""); //from AliModule invokde from AliRun::Tree2Tree() to make requested HMPID branch void SetTreeAddress ( ); //from AliModule invoked from AliRun::GetEvent(), AliLoader::SetTAddrInDet() virtual void StepManager ( )=0; //from AliModule invoked from AliMC - void DoFeed (Bool_t doFeed ){fDoFeed=doFeed;} // Set feedback photons + void DoFeed (Bool_t doFeed ){fgDoFeed=doFeed;} // Set feedback photons //private part +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HitCreate( ) {if(fHits)return; fHits=new TClonesArray("AliHMPIDHit"); fNhits=0; }//create hits list @@ -49,7 +51,7 @@ public: fClu=new TObjArray(7); for(Int_t i=0;i<7;i++)fClu->AddAt(new TClonesArray("AliHMPIDCluster"),i); }//create clusters list void CluReset ( ) {if(fClu)for(int i=0;i<7;i++)fClu->At(i)->Clear(); }//clean clusters list protected: - static Bool_t fDoFeed; + static Bool_t fgDoFeed; //Flag to switch on/off Feedback photon creation TClonesArray *fSdi; //! list of sdigits TObjArray *fDig; //! each chamber holds it's one list of digits TObjArray *fClu; //! each chamber holds it's one list of clusters diff --git a/HMPID/AliHMPIDHit.cxx b/HMPID/AliHMPIDHit.cxx index d1c2989bdf6..5f0ccb23ff1 100644 --- a/HMPID/AliHMPIDHit.cxx +++ b/HMPID/AliHMPIDHit.cxx @@ -22,6 +22,7 @@ ClassImp(AliHMPIDHit) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDHit::Draw(Option_t*) { +// Draw option of the hits in the display Int_t iMark; switch(Pid()){ case 50000050: iMark=4; break; @@ -29,7 +30,7 @@ void AliHMPIDHit::Draw(Option_t*) default: iMark=26; break; } TMarker *pMark=new TMarker(fLx,fLy,iMark); pMark->SetMarkerColor(kRed); pMark->Draw(); -} +}//Draw //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDHit::Hit2Sdi(TClonesArray *pSdiLst,Int_t iHow)const { @@ -50,7 +51,7 @@ void AliHMPIDHit::Hit2Sdi(TClonesArray *pSdiLst,Int_t iHow)const new((*pSdiLst)[iSdiCnt++]) AliHMPIDDigit(dig); } } -} +}//Hit2Sdi //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDHit::Print(Option_t *opt)const { @@ -74,5 +75,5 @@ void AliHMPIDHit::Print(Option_t *opt)const Printf("%sHIT: ch=%i (%7.3f,%7.3f) Q=%8.3f TID= %5i, MARS=(%7.2f,%7.2f,%7.2f) %s %s", opt, Ch(), fLx,fLy, fQ, fTrack, X(), Y(), Z(), sPart, (AliHMPIDDigit::IsInDead(LorsX(),LorsY()))? "IN DEAD ZONE":""); -} +}//Print //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/HMPID/AliHMPIDHit.h b/HMPID/AliHMPIDHit.h index 942a762fcac..40b1064c398 100644 --- a/HMPID/AliHMPIDHit.h +++ b/HMPID/AliHMPIDHit.h @@ -2,7 +2,10 @@ #define AliHMPIDHit_h /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - +//. +// HMPID base class to produce hits +//. +//. #include //base class #include //ctor #include "AliHMPIDDigit.h" //QdcTot() diff --git a/HMPID/AliHMPIDParam.cxx b/HMPID/AliHMPIDParam.cxx index 5ae43cbbb16..c7a0c859a1e 100644 --- a/HMPID/AliHMPIDParam.cxx +++ b/HMPID/AliHMPIDParam.cxx @@ -70,12 +70,12 @@ void AliHMPIDParam::IdealPosition(Int_t iCh, TGeoHMatrix *pMatrix) // Construct ideal position matrix for a given chamber // Arguments: iCh- chamber ID; pMatrix- pointer to precreated unity matrix where to store the results // Returns: none - const Double_t kAngHor=19.5; // horizontal angle between chambers 19.5 grad - const Double_t kAngVer=20; // vertical angle between chambers 20 grad - const Double_t kAngCom=30; // common HMPID rotation with respect to x axis 30 grad - const Double_t trans[3]={490,0,0}; //center of the chamber is on window-gap surface - pMatrix->RotateY(90); //rotate around y since initial position is in XY plane -> now in YZ plane - pMatrix->SetTranslation(trans); //now plane in YZ is shifted along x + const Double_t kAngHor=19.5; // horizontal angle between chambers 19.5 grad + const Double_t kAngVer=20; // vertical angle between chambers 20 grad + const Double_t kAngCom=30; // common HMPID rotation with respect to x axis 30 grad + const Double_t kTrans[3]={490,0,0}; // center of the chamber is on window-gap surface + pMatrix->RotateY(90); // rotate around y since initial position is in XY plane -> now in YZ plane + pMatrix->SetTranslation(kTrans); // now plane in YZ is shifted along x switch(iCh){ case 0: pMatrix->RotateY(kAngHor); pMatrix->RotateZ(-kAngVer); break; //right and down case 1: pMatrix->RotateZ(-kAngVer); break; //down diff --git a/HMPID/AliHMPIDParam.h b/HMPID/AliHMPIDParam.h index 1e0d7eb98a5..82f950f3c53 100644 --- a/HMPID/AliHMPIDParam.h +++ b/HMPID/AliHMPIDParam.h @@ -22,11 +22,11 @@ public: void Print(Option_t *opt="") const; //print current parametrization static inline AliHMPIDParam* Instance(); //pointer to AliHMPIDParam singleton - Double_t MeanIdxRad () {return 1.29204;} //<--TEMPORAR--> to be removed in future Mean ref index C6F14 - Double_t MeanIdxWin () {return 1.57819;} //<--TEMPORAR--> to be removed in future. Mean ref index quartz - Float_t DistCut () {return 1.0;} //<--TEMPORAR--> to be removed in future. Cut for MIP-TRACK residual - Float_t QCut () {return 100;} //<--TEMPORAR--> to be removed in future. Separation PHOTON-MIP charge - Float_t MultCut () {return 200;} //<--TEMPORAR--> to be removed in future. Multiplicity cut to activate WEIGHT procedure + Double_t MeanIdxRad ()const {return 1.29204;} //<--TEMPORAR--> to be removed in future Mean ref index C6F14 + Double_t MeanIdxWin ()const {return 1.57819;} //<--TEMPORAR--> to be removed in future. Mean ref index quartz + Float_t DistCut ()const {return 1.0;} //<--TEMPORAR--> to be removed in future. Cut for MIP-TRACK residual + Float_t QCut ()const {return 100;} //<--TEMPORAR--> to be removed in future. Separation PHOTON-MIP charge + Float_t MultCut ()const {return 200;} //<--TEMPORAR--> to be removed in future. Multiplicity cut to activate WEIGHT procedure static Int_t Stack(Int_t evt=-1,Int_t tid=-1); //Print stack info for event and tid static Int_t StackCount(Int_t pid,Int_t evt); //Counts stack particles of given sort in given event static void IdealPosition(Int_t iCh,TGeoHMatrix *m); //ideal position of given chamber @@ -45,9 +45,9 @@ public: protected: AliHMPIDParam(); //default ctor is protected to enforce it to be singleton static AliHMPIDParam *fgInstance; //static pointer to instance of AliHMPIDParam singleton - TGeoHMatrix *fM[7]; //pointers to matrices defining HMPID chambers rotations-translations - Float_t fX; //x shift of LORS with respect to rotated MARS - Float_t fY; //y shift of LORS with respect to rotated MARS + TGeoHMatrix *fM[7]; //pointers to matrices defining HMPID chambers rotations-translations + Float_t fX; //x shift of LORS with respect to rotated MARS + Float_t fY; //y shift of LORS with respect to rotated MARS ClassDef(AliHMPIDParam,0) //HMPID main parameters class }; diff --git a/HMPID/AliHMPIDPreprocessor.cxx b/HMPID/AliHMPIDPreprocessor.cxx index 8fbebad47fc..232a7176f91 100644 --- a/HMPID/AliHMPIDPreprocessor.cxx +++ b/HMPID/AliHMPIDPreprocessor.cxx @@ -7,15 +7,17 @@ #include //Process() #include //Process() +//. +// HMPID Preprocessor base class +//. +//. +//. ClassImp(AliHMPIDPreprocessor) -char *AliHMPIDPreprocessor::fP ="HMP_DET/HMP_MP%i/HMP_MP%i_GAS/HMP_MP%i_GAS_PMWC.actual.value"; -char *AliHMPIDPreprocessor::fT1="HMP_DET/HMP_MP%i/HMP_MP%i_LIQ_LOOP.actual.sensors.Rad%iIn_Temp"; -char *AliHMPIDPreprocessor::fT2="HMP_DET/HMP_MP%i/HMP_MP%i_LIQ_LOOP.actual.sensors.Rad%iOut_Temp"; -char *AliHMPIDPreprocessor::fHV="HMP_DET/HMP_MP%i/HMP_MP%i_PW/HMP_MP%i_SEC0/HMP_MP%i_SEC0_HV.actual.vMon"; - - - +char *AliHMPIDPreprocessor::fgP ="HMP_DET/HMP_MP%i/HMP_MP%i_GAS/HMP_MP%i_GAS_PMWC.actual.value"; +char *AliHMPIDPreprocessor::fgT1="HMP_DET/HMP_MP%i/HMP_MP%i_LIQ_LOOP.actual.sensors.Rad%iIn_Temp"; +char *AliHMPIDPreprocessor::fgT2="HMP_DET/HMP_MP%i/HMP_MP%i_LIQ_LOOP.actual.sensors.Rad%iOut_Temp"; +char *AliHMPIDPreprocessor::fgHV="HMP_DET/HMP_MP%i/HMP_MP%i_PW/HMP_MP%i_SEC0/HMP_MP%i_SEC0_HV.actual.vMon"; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDPreprocessor::Initialize(Int_t run, UInt_t startTime,UInt_t endTime) diff --git a/HMPID/AliHMPIDPreprocessor.h b/HMPID/AliHMPIDPreprocessor.h index 2f68193d656..7f8736a4505 100644 --- a/HMPID/AliHMPIDPreprocessor.h +++ b/HMPID/AliHMPIDPreprocessor.h @@ -3,6 +3,9 @@ #include //base class +//. +//HMPID Preprocessor base class +//. class TMap; class AliHMPIDPreprocessor : public AliPreprocessor @@ -10,11 +13,12 @@ class AliHMPIDPreprocessor : public AliPreprocessor public: AliHMPIDPreprocessor(AliShuttleInterface* pShuttle):AliPreprocessor("HMP",pShuttle) {} virtual ~AliHMPIDPreprocessor( ) {} - static char *fP; // Name of the aliases provided by the DCS - static char *fHV; // Name of the aliases provided by the DCS - static char *fT1; // Name of the aliases provided by the DCS - static char *fT2; // Name of the aliases provided by the DCS + protected: + static char *fgP; // Name of the aliases provided by the DCS + static char *fgHV; // Name of the aliases provided by the DCS + static char *fgT1; // Name of the aliases provided by the DCS + static char *fgT2; // Name of the aliases provided by the DCS virtual void Initialize(Int_t run, UInt_t startTime, UInt_t endTime); virtual UInt_t Process (TMap* pDcsMap ); ClassDef(AliHMPIDPreprocessor, 0); diff --git a/HMPID/AliHMPIDRecon.h b/HMPID/AliHMPIDRecon.h index f2060c74412..9febcc33ebd 100644 --- a/HMPID/AliHMPIDRecon.h +++ b/HMPID/AliHMPIDRecon.h @@ -46,7 +46,8 @@ public : Double_t SigCrom (Double_t ckovTh,Double_t ckovPh,Double_t beta )const;//error due to unknonw photon energy Double_t Sigma2 (Double_t ckovTh,Double_t ckovPh )const;//photon candidate sigma enum ETrackingFlags {kMipDistCut=-9,kMipQdcCut=-5,kNoPhotAccept=-11}; - + +private: static const Double_t fgkRadThick; //radiator thickness static const Double_t fgkWinThick; //window thickness static const Double_t fgkGapThick; //proximity gap thickness diff --git a/HMPID/AliHMPIDReconstructor.cxx b/HMPID/AliHMPIDReconstructor.cxx index 8aa200f0241..0c1c106e275 100644 --- a/HMPID/AliHMPIDReconstructor.cxx +++ b/HMPID/AliHMPIDReconstructor.cxx @@ -12,7 +12,11 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - +//. +// HMPID base class to reconstruct an event +//. +//. +//. #include "AliHMPIDReconstructor.h" //class header #include "AliHMPID.h" //Reconstruct() #include "AliHMPIDCluster.h" //Dig2Clu() diff --git a/HMPID/AliHMPIDReconstructor.h b/HMPID/AliHMPIDReconstructor.h index 70838f140ab..7b381fae799 100644 --- a/HMPID/AliHMPIDReconstructor.h +++ b/HMPID/AliHMPIDReconstructor.h @@ -2,7 +2,9 @@ #define AliHMPIDReconstructor_h /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - +//. +// HMPID base class to reconstruct an event +//. #include //base class #include "AliHMPIDTracker.h" //CreateTracker() #include //UseDig() diff --git a/HMPID/AliHMPIDTracker.cxx b/HMPID/AliHMPIDTracker.cxx index d479ae72e5b..aef985793de 100644 --- a/HMPID/AliHMPIDTracker.cxx +++ b/HMPID/AliHMPIDTracker.cxx @@ -8,7 +8,11 @@ #include //GetTrackPoint() #include #include - +//. +// HMPID base class fo tracking +//. +//. +//. ClassImp(AliHMPIDTracker) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ AliHMPIDTracker::AliHMPIDTracker():AliTracker() diff --git a/HMPID/AliHMPIDTracker.h b/HMPID/AliHMPIDTracker.h index 9253f018d13..216a86a3b13 100644 --- a/HMPID/AliHMPIDTracker.h +++ b/HMPID/AliHMPIDTracker.h @@ -4,7 +4,11 @@ #include //base class #include "AliHMPID.h" //Recon() #include //Recon() -#include //field +#include //field +//. +// HMPID base class fo tracking +//. + class AliESD; //Recon() class AliESDtrack; //IntTrkCha() class AliHMPIDTracker : public AliTracker @@ -17,7 +21,7 @@ public: Bool_t GetTrackPoint (Int_t idx,AliTrackPoint &pt)const; // from AliTracker Int_t Clusters2Tracks(AliESD * ) {return 0;} //pure virtual from AliTracker Int_t LoadClusters (TTree *pCluTr ); //pure virtual from AliTracker - Int_t PropagateBack (AliESD * ); //pure virtual from AliTracker + Int_t PropagateBack (AliESD *pEsd ); //pure virtual from AliTracker Int_t RefitInward (AliESD * ) {return 0;} //pure virtual from AliTracker void UnloadClusters ( ) { } //pure virtual from AliTracker //private part diff --git a/HMPID/AliHMPIDv0.h b/HMPID/AliHMPIDv0.h index 2ddccb076b9..0ac9732b4b2 100644 --- a/HMPID/AliHMPIDv0.h +++ b/HMPID/AliHMPIDv0.h @@ -3,7 +3,9 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - +//. +//HMPID v0 implementation. +//. #include "AliHMPID.h" class AliHMPIDv0 : public AliHMPID diff --git a/HMPID/AliHMPIDv1.h b/HMPID/AliHMPIDv1.h index 9db5478139c..a42dcf10490 100644 --- a/HMPID/AliHMPIDv1.h +++ b/HMPID/AliHMPIDv1.h @@ -3,7 +3,9 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - +// +//HMPID base class of geometry +// #include "AliHMPID.h" //base class #include "AliHMPIDDigitizer.h" //CreateDigitizer() @@ -17,14 +19,14 @@ public: void AddAlignableVolumes( )const; //from AliModule invoked from AliMC void CreateMaterials ( ); //from AliModule invoked from AliMC void CreateGeometry ( ); //from AliModule invoked from AliMC - AliDigitizer* CreateDigitizer (AliRunDigitizer *m )const{return new AliHMPIDDigitizer(m);} //from AliModule invoked from AliSimulation::RunDigitization() + AliDigitizer* CreateDigitizer (AliRunDigitizer *m )const{return new AliHMPIDDigitizer(m);} //from AliModule invoked from AliSimulation::RunDigitization() void Digits2Raw ( ); //from AliModule invoked from AliSimulation::WriteRawFiles() virtual void DefineOpticalProperties(); //from AliModule invoked from AliMC::ConstructOpGeometry() to set Cerenkov properties void Hits2SDigits ( ); //from AliModule invoked from AliSimulation::RunSDigitization() void Init ( ); //from AliModule invoked from AliMC::InitGeometry() Int_t IsVersion ( )const{return 1; } //from AliModule not used void Print (const Option_t *opt="" )const; //from TObject - Bool_t Raw2SDigits (AliRawReader * ); //from AliMOdule invoked from AliSimulation + Bool_t Raw2SDigits (AliRawReader *pRR ); //from AliMOdule invoked from AliSimulation void StepManager ( ); //from AliModule invoked from AliMC::Stepping() //private part++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void GenFee (Float_t qtot ); //generates feedback photons -- 2.43.0