From ef665f5e26888ea6feb2bc20cfd390d3cba6e78c Mon Sep 17 00:00:00 2001 From: masera Date: Tue, 17 Feb 2009 14:11:37 +0000 Subject: [PATCH] Changes to obey code conventions --- ITS/AliITSDetTypeRec.cxx | 20 ++++----- ITS/AliITSDetTypeRec.h | 28 +++++------- ITS/AliITSDetTypeSim.cxx | 95 +++++++--------------------------------- ITS/AliITSDetTypeSim.h | 51 +++++++++------------ ITS/AliITSclusterSSD.h | 7 ++- 5 files changed, 60 insertions(+), 141 deletions(-) diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx index d9954e5aa9f..004c01623ce 100644 --- a/ITS/AliITSDetTypeRec.cxx +++ b/ITS/AliITSDetTypeRec.cxx @@ -26,21 +26,15 @@ #include "TTree.h" #include "AliCDBManager.h" -#include "AliCDBStorage.h" #include "AliCDBEntry.h" #include "AliITSClusterFinder.h" #include "AliITSClusterFinderV2SPD.h" #include "AliITSClusterFinderV2SDD.h" #include "AliITSClusterFinderV2SSD.h" #include "AliITSDetTypeRec.h" -#include "AliITSgeom.h" +#include "AliITSDDLModuleMapSDD.h" #include "AliITSRecPoint.h" -#include "AliITSReconstructor.h" -#include "AliITSRecoParam.h" #include "AliITSCalibrationSDD.h" -#include "AliITSMapSDD.h" -#include "AliITSDriftSpeedArraySDD.h" -#include "AliITSDriftSpeedSDD.h" #include "AliITSHLTforSDD.h" #include "AliITSCalibrationSSD.h" #include "AliITSNoiseSSDv2.h" @@ -54,6 +48,10 @@ #include "AliITSsegmentationSSD.h" #include "AliLog.h" +class AliITSDriftSpeedArraySDD; +class AliITSMapSDD; +class AliITSresponseSDD; +class AliITSRecoParam; const Int_t AliITSDetTypeRec::fgkNdettypes = 3; const Int_t AliITSDetTypeRec::fgkDefaultNModulesSPD = 240; @@ -93,7 +91,7 @@ fFastOrFiredMap(1200){ fReconstruction = new TObjArray(fgkNdettypes); fDigits = new TObjArray(fgkNdettypes); for(Int_t i=0; i<3; i++){ - fDigClassName[i]=0; + fkDigClassName[i]=0; } fSSDCalibration=new AliITSCalibrationSSD(); fNMod = new Int_t [fgkNdettypes]; @@ -909,7 +907,7 @@ void AliITSDetTypeRec::DigitsToRecPoints(AliRawReader* rawReader,TTree *treeR,Op } //______________________________________________________________________ -void AliITSDetTypeRec::ReadOldSSDNoise(TObjArray *array, +void AliITSDetTypeRec::ReadOldSSDNoise(const TObjArray *array, AliITSNoiseSSDv2 *noiseSSD) { //Reads the old SSD calibration object and converts it to the new format const Int_t fgkSSDSTRIPSPERMODULE = 1536; @@ -933,7 +931,7 @@ void AliITSDetTypeRec::ReadOldSSDNoise(TObjArray *array, } //______________________________________________________________________ -void AliITSDetTypeRec::ReadOldSSDBadChannels(TObjArray *array, +void AliITSDetTypeRec::ReadOldSSDBadChannels(const TObjArray *array, AliITSBadChannelsSSDv2 *badChannelsSSD) { //Reads the old SSD calibration object and converts it to the new format Int_t gNMod = array->GetEntries(); @@ -957,7 +955,7 @@ void AliITSDetTypeRec::ReadOldSSDBadChannels(TObjArray *array, } //______________________________________________________________________ -void AliITSDetTypeRec::ReadOldSSDGain(TObjArray *array, +void AliITSDetTypeRec::ReadOldSSDGain(const TObjArray *array, AliITSGainSSDv2 *gainSSD) { //Reads the old SSD calibration object and converts it to the new format diff --git a/ITS/AliITSDetTypeRec.h b/ITS/AliITSDetTypeRec.h index ff270785204..403aae77bf3 100644 --- a/ITS/AliITSDetTypeRec.h +++ b/ITS/AliITSDetTypeRec.h @@ -12,28 +12,24 @@ $Id$ // detector specific reconstruction for the ITS. // //////////////////////////////////////////////////////////////////////// #include -#include #include #include -#include "AliITSDDLModuleMapSDD.h" -#include "AliITSFastOrCalibrationSPD.h" -#include "AliITSresponseSDD.h" -#include "AliITSgeom.h" + +class TObjArray; class TTree; class TBranch; - -//#include "AliITSLoader.h" -//#include "AliRunLoader.h" - +class AliITSgeom; class AliITSsegmentation; class AliITSCalibration; class AliITSCalibrationSSD; +class AliITSFastOrCalibrationSPD; class AliITSresponseSDD; class AliITSClusterFinder; class AliITSRecPoint; class AliRawReader; class AliITSGainSSDv2; class AliITSBadChannelsSSDv2; +class AliITSDDLModuleMapSDD; class AliITSNoiseSSDv2; class AliITSDetTypeRec : public TObject { @@ -72,12 +68,12 @@ class AliITSDetTypeRec : public TObject { } virtual void SetDigitClassName(Int_t i,const Char_t *digit) - {fDigClassName[i]=digit;} + {fkDigClassName[i]=digit;} virtual void SetLoadOnlySPDCalib(Bool_t opt=kFALSE) {fLoadOnlySPDCalib=opt;} - const Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];} + const Char_t* GetDigitClassName(Int_t i) const {return fkDigClassName[i];} TObjArray* GetDigits() const {return fDigits;} TClonesArray *DigitsAddress(Int_t id) const {return ((TClonesArray*)(*fDigits)[id]);} @@ -92,7 +88,7 @@ class AliITSDetTypeRec : public TObject { void AddRecPoint(const AliITSRecPoint &p); void ResetRecPoints(){if(fRecPoints) fRecPoints->Clear();fNRecPoints = 0;}; // Return pointer to rec points - TClonesArray *RecPoints() {return fRecPoints;} + TClonesArray *RecPoints() const {return fRecPoints;} void MakeBranchRF(TTree *treeR){MakeBranchR(treeR,"Fast");} void DigitsToRecPoints(TTree *treeD,TTree *treeR,Int_t lastEntry,Option_t *det, Int_t optCluFind=0); void DigitsToRecPoints(AliRawReader* rawReader,TTree *treeR,Option_t *det="All"); @@ -107,11 +103,11 @@ class AliITSDetTypeRec : public TObject { AliITSDetTypeRec& operator=(const AliITSDetTypeRec &source); //conversion of the old SSD calibration objects tothe new ones - void ReadOldSSDNoise(TObjArray *array, + void ReadOldSSDNoise(const TObjArray *array, AliITSNoiseSSDv2 *noiseSSD); - void ReadOldSSDBadChannels(TObjArray *array, + void ReadOldSSDBadChannels(const TObjArray *array, AliITSBadChannelsSSDv2 *badChannelsSSD); - void ReadOldSSDGain(TObjArray *array, + void ReadOldSSDGain(const TObjArray *array, AliITSGainSSDv2 *gainSSD); // virtual void SetLoader(AliITSLoader* loader) {fLoader=loader;} @@ -134,7 +130,7 @@ class AliITSDetTypeRec : public TObject { AliITSresponseSDD *fRespSDD; //! SDD response parameters Float_t fAveGainSDD; //! Average gain of SDD good anodes Bool_t fIsHLTmodeC; //! flag for HLT mode C status (used by SDD) - const Char_t* fDigClassName[3]; //! String with digit class name. + const Char_t* fkDigClassName[3]; //! String with digit class name. TClonesArray *fRecPoints; //! List of reconstructed points diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx index d9bfa247429..abeca192b5d 100644 --- a/ITS/AliITSDetTypeSim.cxx +++ b/ITS/AliITSDetTypeSim.cxx @@ -35,13 +35,14 @@ #include "AliCDBStorage.h" #include "AliCDBEntry.h" #include "AliCDBMetaData.h" - #include "AliITSdigit.h" #include "AliITSdigitSPD.h" #include "AliITSdigitSDD.h" #include "AliITSdigitSSD.h" +#include "AliITSgeom.h" #include "AliITSDetTypeSim.h" #include "AliITSpListItem.h" +#include "AliITSCalibration.h" #include "AliITSCalibrationSDD.h" #include "AliITSMapSDD.h" #include "AliITSDriftSpeedArraySDD.h" @@ -62,7 +63,7 @@ #include "AliITSsimulationSPD.h" #include "AliITSsimulationSDD.h" #include "AliITSsimulationSSD.h" - +#include "AliITSDDLModuleMapSDD.h" const Int_t AliITSDetTypeSim::fgkNdettypes = 3; const Int_t AliITSDetTypeSim::fgkDefaultNModulesSPD = 240; @@ -78,8 +79,6 @@ fSimulation(), // [NDet] fSegmentation(), // [NDet] fCalibration(), // [NMod] fSSDCalibration(0), -fPreProcess(), // [] e.g. Fill fHitModule with hits -fPostProcess(), // [] e.g. Wright Raw data fNSDigits(0), //! number of SDigits fSDigits("AliITSpListItem",1000), fNDigits(0), //! number of Digits @@ -87,9 +86,7 @@ fRunNumber(0), //! Run number (to access DB) fDigits(), //! [NMod][NDigits] fSimuPar(0), fDDLMapSDD(0), -fHitClassName(), // String with Hit class name. -fSDigClassName(),// String with SDigit class name. -fDigClassName(), // String with digit class name. +fkDigClassName(), // String with digit class name. fLoader(0), // local pointer to loader fFirstcall(kTRUE), fIsHLTmodeC(0){ // flag @@ -141,16 +138,6 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){ } fCalibration = 0; if(fSSDCalibration) delete fSSDCalibration; - if(fPreProcess){ - fPreProcess->Delete(); - delete fPreProcess; - } - fPreProcess = 0; - if(fPostProcess){ - fPostProcess->Delete(); - delete fPostProcess; - } - fPostProcess = 0; if(fSimuPar) delete fSimuPar; if(fDDLMapSDD) delete fDDLMapSDD; if(fNDigits) delete [] fNDigits; @@ -170,8 +157,6 @@ fSimulation(source.fSimulation), // [NDet] fSegmentation(source.fSegmentation), // [NDet] fCalibration(source.fCalibration), // [NMod] fSSDCalibration(source.fSSDCalibration), -fPreProcess(source.fPreProcess), // [] e.g. Fill fHitModule with hits -fPostProcess(source.fPostProcess), // [] e.g. Wright Raw data fNSDigits(source.fNSDigits), //! number of SDigits fSDigits(*((TClonesArray*)source.fSDigits.Clone())), fNDigits(source.fNDigits), //! number of Digits @@ -179,16 +164,14 @@ fRunNumber(source.fRunNumber), //! Run number (to access DB) fDigits(source.fDigits), //! [NMod][NDigits] fSimuPar(source.fSimuPar), fDDLMapSDD(source.fDDLMapSDD), -fHitClassName(source.fHitClassName), // String with Hit class name. -fSDigClassName(source.fSDigClassName),// String with SDigit class name. -fDigClassName(), // String with digit class name. +fkDigClassName(), // String with digit class name. fLoader(source.fLoader), // local pointer to loader fFirstcall(source.fFirstcall), fIsHLTmodeC(source.fIsHLTmodeC) { // Copy Constructor for object AliITSDetTypeSim not allowed for(Int_t i=0;iAddAt(sim,dettype); } //______________________________________________________________________ -AliITSsimulation* AliITSDetTypeSim::GetSimulationModel(Int_t dettype){ +AliITSsimulation* AliITSDetTypeSim::GetSimulationModel(Int_t dettype) const { //Get simulation model for detector type if(fSimulation==0) { @@ -257,7 +240,7 @@ AliITSsimulation* AliITSDetTypeSim::GetSimulationModel(Int_t dettype){ return (AliITSsimulation*)(fSimulation->At(dettype)); } //______________________________________________________________________ -AliITSsimulation* AliITSDetTypeSim::GetSimulationModelByModule(Int_t module){ +AliITSsimulation* AliITSDetTypeSim::GetSimulationModelByModule(Int_t module) const { //Get simulation model by module number if(GetITSgeom()==0) { @@ -304,7 +287,7 @@ void AliITSDetTypeSim::SetSegmentationModel(Int_t dettype, fSegmentation->AddAt(seg,dettype); } //______________________________________________________________________ -AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModel(Int_t dettype){ +AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModel(Int_t dettype) const{ //Get segmentation model for detector type if(fSegmentation==0) { @@ -314,7 +297,7 @@ AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModel(Int_t dettype){ return (AliITSsegmentation*)(fSegmentation->At(dettype)); } //_______________________________________________________________________ -AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModelByModule(Int_t module){ +AliITSsegmentation* AliITSDetTypeSim::GetSegmentationModelByModule(Int_t module) const{ //Get segmentation model by module number if(GetITSgeom()==0){ Warning("GetSegmentationModelByModule","GetITSgeom() is 0!"); @@ -369,7 +352,7 @@ void AliITSDetTypeSim::ResetSegmentation(){ if(fSegmentation) fSegmentation->Clear(); } //_______________________________________________________________________ -AliITSCalibration* AliITSDetTypeSim::GetCalibrationModel(Int_t iMod){ +AliITSCalibration* AliITSDetTypeSim::GetCalibrationModel(Int_t iMod) const { //Get response model for module number iMod if(fCalibration==0) { @@ -804,7 +787,7 @@ void AliITSDetTypeSim::AddSumDigit(AliITSpListItem &sdig){ new(fSDigits[fNSDigits++]) AliITSpListItem(sdig); } //__________________________________________________________ -void AliITSDetTypeSim::AddSimDigit(Int_t branch, AliITSdigit* d){ +void AliITSDetTypeSim::AddSimDigit(Int_t branch, const AliITSdigit* d){ // Add a simulated digit. TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch)); @@ -841,55 +824,7 @@ void AliITSDetTypeSim::AddSimDigit(Int_t branch,Float_t phys,Int_t *digits, } } //______________________________________________________________________ -void AliITSDetTypeSim::StoreCalibration(Int_t firstRun, Int_t lastRun, - AliCDBMetaData &md) { - // Store calibration in the calibration database - // The database must be created in an external piece of code (i.e. - // a configuration macro ) - - if(!AliCDBManager::Instance()->IsDefaultStorageSet()) { - AliWarning("No storage set! Will use dummy one"); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); - } - - if (!fCalibration) { - AliError("AliITSCalibration classes are not defined - nothing done"); - return; - } - AliCDBId idRespSPD("ITS/Calib/SPDDead",firstRun, lastRun); - AliCDBId idRespSDD("ITS/Calib/CalibSDD",firstRun, lastRun); - AliCDBId idRespSSD("ITS/Calib/CalibSSD",firstRun, lastRun); - - TObjArray respSPD(fNMod[0]); - TObjArray respSDD(fNMod[1]-fNMod[0]); - TObjArray respSSD(fNMod[2]-fNMod[1]); - respSPD.SetOwner(kFALSE); - respSSD.SetOwner(kFALSE); - respSSD.SetOwner(kFALSE); - - Int_t index[fgkNdettypes]; - for (Int_t i = 0; iAt(i)); - - for (Int_t i = index[0]; iAt(i)); - - for (Int_t i = index[1]; iAt(i)); - - AliCDBManager::Instance()->Put(&respSPD, idRespSPD, &md); - AliCDBManager::Instance()->Put(&respSDD, idRespSDD, &md); - AliCDBManager::Instance()->Put(&respSSD, idRespSSD, &md); -} - -//______________________________________________________________________ -void AliITSDetTypeSim::ReadOldSSDNoise(TObjArray *array, +void AliITSDetTypeSim::ReadOldSSDNoise(const TObjArray *array, AliITSNoiseSSDv2 *noiseSSD) { //Reads the old SSD calibration object and converts it to the new format const Int_t fgkSSDSTRIPSPERMODULE = 1536; @@ -913,7 +848,7 @@ void AliITSDetTypeSim::ReadOldSSDNoise(TObjArray *array, } //______________________________________________________________________ -void AliITSDetTypeSim::ReadOldSSDBadChannels(TObjArray *array, +void AliITSDetTypeSim::ReadOldSSDBadChannels(const TObjArray *array, AliITSBadChannelsSSDv2 *badChannelsSSD) { //Reads the old SSD calibration object and converts it to the new format Int_t nMod = array->GetEntries(); @@ -937,7 +872,7 @@ void AliITSDetTypeSim::ReadOldSSDBadChannels(TObjArray *array, } //______________________________________________________________________ -void AliITSDetTypeSim::ReadOldSSDGain(TObjArray *array, +void AliITSDetTypeSim::ReadOldSSDGain(const TObjArray *array, AliITSGainSSDv2 *gainSSD) { //Reads the old SSD calibration object and converts it to the new format diff --git a/ITS/AliITSDetTypeSim.h b/ITS/AliITSDetTypeSim.h index 7247bf3ee60..d007ceefed7 100644 --- a/ITS/AliITSDetTypeSim.h +++ b/ITS/AliITSDetTypeSim.h @@ -13,14 +13,11 @@ $Id$ ///////////////////////////////////////////////////////////////////////// #include -#include -#include -#include "AliITSCalibration.h" -#include "AliITSSimuParam.h" -#include "AliITSDDLModuleMapSDD.h" #include "AliITSLoader.h" -#include "AliITSgeom.h" +#include "AliITSSimuParam.h" +class TObjArray; +class TClonesArray; class TTree; class AliCDBMetaData; class AliITSdigit; @@ -33,6 +30,9 @@ class AliITSCalibrationSSD; class AliITSGainSSDv2; class AliITSBadChannelsSSDv2; class AliITSNoiseSSDv2; +class AliITSDDLModuleMapSDD; +class AliITSCalibration; +class AliITSgeom; class AliITSDetTypeSim : public TObject { public: @@ -47,21 +47,17 @@ class AliITSDetTypeSim : public TObject { void SetITSgeom(AliITSgeom *geom); virtual void SetSimulationModel(Int_t dettype,AliITSsimulation *sim); - virtual AliITSsimulation* GetSimulationModel(Int_t dettype); - virtual AliITSsimulation* GetSimulationModelByModule(Int_t module); + virtual AliITSsimulation* GetSimulationModel(Int_t dettype) const; + virtual AliITSsimulation* GetSimulationModelByModule(Int_t module) const; virtual void SetSegmentationModel(Int_t dettype,AliITSsegmentation *seg); - virtual AliITSsegmentation* GetSegmentationModel(Int_t dettype); - virtual AliITSsegmentation* GetSegmentationModelByModule(Int_t module); + virtual AliITSsegmentation* GetSegmentationModel(Int_t dettype) const; + virtual AliITSsegmentation* GetSegmentationModelByModule(Int_t module) const; virtual void SetCalibrationModel(Int_t iMod,AliITSCalibration *resp); - virtual AliITSCalibration* GetCalibrationModel(Int_t iMod); - /* - virtual AliITSresponse* GetResponse(Int_t dettype) { - return GetCalibrationModel( - GetITSgeom()->GetStartDet(dettype))->GetResponse();} - */ - virtual void SetSimuParam(AliITSSimuParam* spar){ + virtual AliITSCalibration* GetCalibrationModel(Int_t iMod) const; + + virtual void SetSimuParam(const AliITSSimuParam* spar){ if(fSimuPar) delete fSimuPar; fSimuPar = new AliITSSimuParam(*spar); } @@ -96,14 +92,13 @@ class AliITSDetTypeSim : public TObject { virtual void SDigitsToDigits(Option_t *opt, Char_t* name); virtual void AddSumDigit(AliITSpListItem &sdig); - virtual void AddSimDigit(Int_t branch, AliITSdigit *d); + virtual void AddSimDigit(Int_t branch, const AliITSdigit *d); virtual void AddSimDigit(Int_t branch,Float_t phys,Int_t* digits, Int_t* tracks,Int_t *hits,Float_t* trkcharges, Int_t sigexpanded=-1000); virtual void SetDigitClassName(Int_t i, const Char_t* name) { - fDigClassName[i]=name;} - const Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];} - void StoreCalibration(Int_t firstRun, Int_t lastRun, AliCDBMetaData &md); + fkDigClassName[i]=name;} + const Char_t* GetDigitClassName(Int_t i) const {return fkDigClassName[i];} protected: virtual void CreateCalibrationArray(); @@ -113,11 +108,11 @@ class AliITSDetTypeSim : public TObject { void SetDefaultSegmentation(Int_t idet); // creates def segm. //conversion of the old SSD calibration objects tothe new ones - void ReadOldSSDNoise(TObjArray *array, + void ReadOldSSDNoise(const TObjArray *array, AliITSNoiseSSDv2 *noiseSSD); - void ReadOldSSDBadChannels(TObjArray *array, + void ReadOldSSDBadChannels(const TObjArray *array, AliITSBadChannelsSSDv2 *badChannelsSSD); - void ReadOldSSDGain(TObjArray *array, + void ReadOldSSDGain(const TObjArray *array, AliITSGainSSDv2 *gainSSD); static const Int_t fgkNdettypes; // number of different det. types @@ -130,8 +125,6 @@ class AliITSDetTypeSim : public TObject { TObjArray *fSegmentation; //! [NDet] TObjArray *fCalibration; //! [NMod] AliITSCalibrationSSD* fSSDCalibration; //! SSD calibration object - TObjArray *fPreProcess; //! [] e.g. Fill fHitModule with hits - TObjArray *fPostProcess; //! [] e.g. Wright Raw data Int_t fNSDigits; //! number of SDigits TClonesArray fSDigits; //! Summable digits Int_t* fNDigits; //! [NDet] number of Digits for det. @@ -139,14 +132,12 @@ class AliITSDetTypeSim : public TObject { TObjArray *fDigits; //! [NMod][NDigits] AliITSSimuParam *fSimuPar; //! detector simulation parameters AliITSDDLModuleMapSDD *fDDLMapSDD; //! mapping DDL/module -> SDD module number - TString fHitClassName; //! String with Hit class name - TString fSDigClassName;//! String with SDigit class name. - const Char_t* fDigClassName[3]; //! String with digit class name. + const Char_t* fkDigClassName[3]; //! String with digit class name. AliITSLoader* fLoader; //! loader Bool_t fFirstcall; //! flag Bool_t fIsHLTmodeC; //! flag for HLT mode C status (used by SDD) - ClassDef(AliITSDetTypeSim,8) // ITS Simulation structure + ClassDef(AliITSDetTypeSim,9) // ITS Simulation structure }; diff --git a/ITS/AliITSclusterSSD.h b/ITS/AliITSclusterSSD.h index bac505bf6fc..5d4f5cb462f 100644 --- a/ITS/AliITSclusterSSD.h +++ b/ITS/AliITSclusterSSD.h @@ -15,8 +15,7 @@ // that are supposed to be generated by one particle. // includes information about clusters on other side that it crosses with #include "TObject.h" - -class TArrayI; +#include "TArrayI.h" class TConesArray; class AliITSdigitSSD; @@ -30,8 +29,8 @@ class AliITSclusterSSD : public TObject{ AliITSclusterSSD& operator=( const AliITSclusterSSD & source); void AddDigit(Int_t index){//adds on digit (*fDigitsIndex)[fNDigits++]=index;} - TObjArray* GetPointer2Digits(){return fDigits;}// comment to be written - void SetPointer2Digits(TObjArray *digits){// comment to be written + TObjArray* GetPointer2Digits() const {return fDigits;}// pointer to digits array + void SetPointer2Digits(TObjArray *digits){// array of digits fDigits = digits;} Int_t GetNumOfDigits() const {//Returns number of digits that creates this cluster return fNDigits;} -- 2.43.0