From: ivana Date: Tue, 10 Feb 2009 09:06:45 +0000 (+0000) Subject: Coding conventions X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=7d5d0cc5e751bdf612fb78ed7cfe55397a79f855 Coding conventions --- diff --git a/MUON/AliMUON2DMap.h b/MUON/AliMUON2DMap.h index 8dffddacafc..bf737621406 100644 --- a/MUON/AliMUON2DMap.h +++ b/MUON/AliMUON2DMap.h @@ -10,8 +10,8 @@ /// // Author Laurent Aphecetche -#ifndef AliMUON2DMAP_H -#define AliMUON2DMAP_H +#ifndef ALIMUON2DMAP_H +#define ALIMUON2DMAP_H #include "AliMUONVStore.h" diff --git a/MUON/AliMUONBusPatchPainter.h b/MUON/AliMUONBusPatchPainter.h index a1faf7d87b8..643c4f8161f 100644 --- a/MUON/AliMUONBusPatchPainter.h +++ b/MUON/AliMUONBusPatchPainter.h @@ -24,7 +24,7 @@ class AliMUONBusPatchPainter : public AliMUONVPainter public: AliMUONBusPatchPainter(); - AliMUONBusPatchPainter(TRootIOCtor*); + AliMUONBusPatchPainter(TRootIOCtor* ioCtor); AliMUONBusPatchPainter(const AliMUONAttPainter& att, Int_t busPatchId); AliMUONBusPatchPainter(const AliMUONBusPatchPainter& rhs); AliMUONBusPatchPainter& operator=(const AliMUONBusPatchPainter& rhs); diff --git a/MUON/AliMUONCheck.cxx b/MUON/AliMUONCheck.cxx index 4b28ce62533..41e5a8b43b1 100644 --- a/MUON/AliMUONCheck.cxx +++ b/MUON/AliMUONCheck.cxx @@ -68,7 +68,7 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* esdFile,Int_t fir fFileName(galiceFile), fFileNameSim(), fesdFileName(esdFile), -foutDir(outDir), +fkOutDir(outDir), fFirstEvent(firstEvent), fLastEvent(lastEvent) { @@ -83,7 +83,7 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* galiceFileSim, fFileName(galiceFile), fFileNameSim(galiceFileSim), fesdFileName(esdFile), -foutDir(outDir), +fkOutDir(outDir), fFirstEvent(firstEvent), fLastEvent(lastEvent) { @@ -335,7 +335,7 @@ AliMUONCheck::CheckESD(Bool_t pdc06TriggerResponse) }//if(pdc06TriggerResponse) - gSystem->cd(foutDir); + gSystem->cd(fkOutDir); FILE *outtxt=fopen("output.txt","a"); freopen("output.txt","a",outtxt); @@ -518,7 +518,7 @@ AliMUONCheck::CheckKine() printf("*** Leaving MuonKine() *** \n"); printf("**************************************************************** \n"); - gSystem->cd(foutDir); + gSystem->cd(fkOutDir); FILE *outtxt=fopen("output.txt","a"); freopen("output.txt","a",outtxt); fprintf(outtxt," \n"); @@ -663,7 +663,7 @@ AliMUONCheck::CheckTrackRef() }//evt loop - gSystem->cd(foutDir); + gSystem->cd(fkOutDir); TCanvas *c6 = new TCanvas("c6","TOF",400,10,600,700); c6->Divide(1,2); c6->cd(1); diff --git a/MUON/AliMUONCheck.h b/MUON/AliMUONCheck.h index 64574103518..066c52f19d5 100644 --- a/MUON/AliMUONCheck.h +++ b/MUON/AliMUONCheck.h @@ -50,7 +50,7 @@ private: TString fFileNameSim; //!< File (galiceSim.root) for simulated data TString fesdFileName; //!< File (AliESDs.root) to read from - const char* foutDir; //!< output data directory + const char* fkOutDir; //!< output data directory Int_t fFirstEvent; //!< First event to consider Int_t fLastEvent; //!< Last event to consider diff --git a/MUON/AliMUONClusterSplitterMLEM.h b/MUON/AliMUONClusterSplitterMLEM.h index 963e4f6cfe7..f79e2d71221 100644 --- a/MUON/AliMUONClusterSplitterMLEM.h +++ b/MUON/AliMUONClusterSplitterMLEM.h @@ -1,5 +1,5 @@ -#ifndef AliMUONClusterSplitterMLEM_H -#define AliMUONClusterSplitterMLEM_H +#ifndef ALIMUONCLUSTERSPLITTERMLEM_H +#define ALIMUONCLUSTERSPLITTERMLEM_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONClusterStoreV2.h b/MUON/AliMUONClusterStoreV2.h index df931c6d727..7be38110c39 100644 --- a/MUON/AliMUONClusterStoreV2.h +++ b/MUON/AliMUONClusterStoreV2.h @@ -1,5 +1,5 @@ -#ifndef AliMUONCLUSTERSTOREV2_H -#define AliMUONCLUSTERSTOREV2_H +#ifndef ALIMUONCLUSTERSTOREV2_H +#define ALIMUONCLUSTERSTOREV2_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONDEPainter.h b/MUON/AliMUONDEPainter.h index 8135b9d0cb7..444153cade7 100644 --- a/MUON/AliMUONDEPainter.h +++ b/MUON/AliMUONDEPainter.h @@ -20,7 +20,7 @@ class AliMUONDEPainter : public AliMUONVPainter { public: AliMUONDEPainter(); - AliMUONDEPainter(TRootIOCtor*); + AliMUONDEPainter(TRootIOCtor* ioCtor); AliMUONDEPainter(const AliMUONAttPainter& att, Int_t detElemId); AliMUONDEPainter(const AliMUONDEPainter& rhs); AliMUONDEPainter& operator=(const AliMUONDEPainter& rhs); diff --git a/MUON/AliMUONGlobalCrateConfig.h b/MUON/AliMUONGlobalCrateConfig.h index 7f08bd34a6e..4e88e0f4d09 100644 --- a/MUON/AliMUONGlobalCrateConfig.h +++ b/MUON/AliMUONGlobalCrateConfig.h @@ -9,8 +9,8 @@ /// /// \author Ch. Finck, Subatech Nantes -#ifndef ALIMUON_GLOBAL_CRATE_CONFIG_H -#define ALIMUON_GLOBAL_CRATE_CONFIG_H +#ifndef ALI_MUON_GLOBAL_CRATE_CONFIG_H +#define ALI_MUON_GLOBAL_CRATE_CONFIG_H #include #include diff --git a/MUON/AliMUONManuPainter.h b/MUON/AliMUONManuPainter.h index 196441f5810..2a48a6f7b78 100644 --- a/MUON/AliMUONManuPainter.h +++ b/MUON/AliMUONManuPainter.h @@ -20,7 +20,7 @@ class AliMUONManuPainter : public AliMUONVPainter { public: - AliMUONManuPainter(TRootIOCtor*); + AliMUONManuPainter(TRootIOCtor* ioCtor); AliMUONManuPainter(); AliMUONManuPainter(const AliMUONAttPainter& att, Int_t detElemId, diff --git a/MUON/AliMUONPCBPainter.h b/MUON/AliMUONPCBPainter.h index 18b1fbd8f1f..cb0fbe47936 100644 --- a/MUON/AliMUONPCBPainter.h +++ b/MUON/AliMUONPCBPainter.h @@ -19,7 +19,7 @@ class AliMUONPCBPainter : public AliMUONVPainter { public: - AliMUONPCBPainter(TRootIOCtor*); + AliMUONPCBPainter(TRootIOCtor* ioCtor); AliMUONPCBPainter(); AliMUONPCBPainter(const AliMUONAttPainter& att, Int_t detElemId, diff --git a/MUON/AliMUONPainterContour.h b/MUON/AliMUONPainterContour.h index f9b46c1a083..6caec5df049 100644 --- a/MUON/AliMUONPainterContour.h +++ b/MUON/AliMUONPainterContour.h @@ -1,5 +1,5 @@ -#ifndef AliMUONPainterContour_H -#define AliMUONPainterContour_H +#ifndef ALIMUONPAINTERCONTOUR_H +#define ALIMUONPAINTERCONTOUR_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONPainterInterfaceHelper.h b/MUON/AliMUONPainterInterfaceHelper.h index bf35475393e..257e1529812 100644 --- a/MUON/AliMUONPainterInterfaceHelper.h +++ b/MUON/AliMUONPainterInterfaceHelper.h @@ -1,5 +1,5 @@ -#ifndef AliMUONPainterInterfaceHelper_H -#define AliMUONPainterInterfaceHelper_H +#ifndef ALIMUONPAINTERINTERFACEHELPER_H +#define ALIMUONPAINTERINTERFACEHELPER_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONQADataMakerRec.h b/MUON/AliMUONQADataMakerRec.h index 759722cf533..3b86a251801 100644 --- a/MUON/AliMUONQADataMakerRec.h +++ b/MUON/AliMUONQADataMakerRec.h @@ -1,5 +1,5 @@ -#ifndef AliMUONQADataMakerRec_H -#define AliMUONQADataMakerRec_H +#ifndef ALIMUONQADATAMAKERREC_H +#define ALIMUONQADATAMAKERREC_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -28,6 +28,22 @@ public: AliMUONQADataMakerRec& operator=(const AliMUONQADataMakerRec& qadm); virtual ~AliMUONQADataMakerRec(); +protected: + + virtual void StartOfDetectorCycle(); + + virtual void InitRaws(); + virtual void InitRecPoints(); + virtual void InitESDs(); + + virtual void MakeRaws(AliRawReader* rawReader); + virtual void MakeRecPoints(TTree* recpo); + virtual void MakeESDs(AliESDEvent* esd) ; + + virtual void DefaultEndOfDetectorCycle(AliQA::TASKINDEX_t) {} + + virtual void EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray** list); + private: /// Raw histograms indices enum ERaw { @@ -89,22 +105,6 @@ private: kESDResidualYPerDESigma = 68 ///< cluster-track residual-Y per DE: sigma }; -protected: - - virtual void StartOfDetectorCycle(); - - virtual void InitRaws(); - virtual void InitRecPoints(); - virtual void InitESDs(); - - virtual void MakeRaws(AliRawReader* rawReader); - virtual void MakeRecPoints(TTree* recpo); - virtual void MakeESDs(AliESDEvent* esd) ; - - virtual void DefaultEndOfDetectorCycle(AliQA::TASKINDEX_t) {} - - virtual void EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray** list); - private: void Ctor(); diff --git a/MUON/AliMUONQADataMakerSim.cxx b/MUON/AliMUONQADataMakerSim.cxx index 1ac72b9cdc8..3205048fae4 100644 --- a/MUON/AliMUONQADataMakerSim.cxx +++ b/MUON/AliMUONQADataMakerSim.cxx @@ -50,7 +50,8 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim() : fHitStore(0x0), fDigitStore(0x0) { - /// ctor + /// Default constructor + AliDebug(1,""); } @@ -60,9 +61,10 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm) fHitStore(0x0), fDigitStore(0x0) { + /// Copy constructor + AliDebug(1,""); - ///copy ctor if ( qadm.fHitStore ) { fHitStore = static_cast(qadm.fHitStore->Clone()); @@ -78,9 +80,10 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm) //__________________________________________________________________ AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMakerSim& qadm ) { + /// Assignment operator + AliDebug(1,""); - /// Equal operator. this->~AliMUONQADataMakerSim(); new(this) AliMUONQADataMakerSim(qadm); return *this; @@ -89,9 +92,10 @@ AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMak //__________________________________________________________________ AliMUONQADataMakerSim::~AliMUONQADataMakerSim() { + /// Destructor + AliDebug(1,""); - /// dtor delete fHitStore; delete fDigitStore; } diff --git a/MUON/AliMUONQADataMakerSim.h b/MUON/AliMUONQADataMakerSim.h index b4925d6354d..53079a817c8 100644 --- a/MUON/AliMUONQADataMakerSim.h +++ b/MUON/AliMUONQADataMakerSim.h @@ -1,5 +1,5 @@ -#ifndef AliMUONQADataMakerSim_H -#define AliMUONQADataMakerSim_H +#ifndef ALIMUONQADATAMAKERSIM_H +#define ALIMUONQADATAMAKERSIM_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONRecoParam.h b/MUON/AliMUONRecoParam.h index 506706fe0c8..c1d928c7f07 100644 --- a/MUON/AliMUONRecoParam.h +++ b/MUON/AliMUONRecoParam.h @@ -1,5 +1,5 @@ -#ifndef AliMUONRecoParam_H -#define AliMUONRecoParam_H +#ifndef ALIMUONRECOPARAM_H +#define ALIMUONRECOPARAM_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index 2c89a621ac2..43e2d66c774 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -165,9 +165,10 @@ fClusterStore(0x0) //_____________________________________________________________________________ AliMUONReconstructor::~AliMUONReconstructor() { + /// dtor + AliDebug(1,""); - /// dtor delete fDigitMaker; delete fDigitStore; delete fTransformer; diff --git a/MUON/AliMUONRegionalTriggerConfig.h b/MUON/AliMUONRegionalTriggerConfig.h index 81d288fa881..73767f080d8 100644 --- a/MUON/AliMUONRegionalTriggerConfig.h +++ b/MUON/AliMUONRegionalTriggerConfig.h @@ -9,8 +9,8 @@ /// /// \author Ch. Finck, Subatech Nantes; I. Hrivnacova, IPN Orsay -#ifndef ALIMUON_REGIONAL_TRIGGER_CONFIG_H -#define ALIMUON_REGIONAL_TRIGGER_CONFIG_H +#ifndef ALI_MUON_REGIONAL_TRIGGER_CONFIG_H +#define ALI_MUON_REGIONAL_TRIGGER_CONFIG_H #include diff --git a/MUON/AliMUONTriggerCrateConfig.h b/MUON/AliMUONTriggerCrateConfig.h index e0d28cd7467..330a3e9c9a5 100644 --- a/MUON/AliMUONTriggerCrateConfig.h +++ b/MUON/AliMUONTriggerCrateConfig.h @@ -9,8 +9,8 @@ /// /// \author Ch. Finck, Subatech Nantes -#ifndef ALIMUON_TRIGGER_CRATE_CONFIG_H -#define ALIMUON_TRIGGER_CRATE_CONFIG_H +#ifndef ALI_MUON_TRIGGER_CRATE_CONFIG_H +#define ALI_MUON_TRIGGER_CRATE_CONFIG_H #include "AliMpArrayI.h" #include "AliMpTriggerCrate.h" @@ -23,7 +23,7 @@ class AliMUONTriggerCrateConfig : public TObject { public: AliMUONTriggerCrateConfig(AliMpTriggerCrate* mpTriggerCrate); - AliMUONTriggerCrateConfig(TRootIOCtor* /*ioCtor*/); + AliMUONTriggerCrateConfig(TRootIOCtor* ioCtor); virtual ~AliMUONTriggerCrateConfig(); // set methods diff --git a/MUON/mapping/AliMpCathodType.cxx b/MUON/mapping/AliMpCathodType.cxx index d71525c9fcc..9a846530e21 100644 --- a/MUON/mapping/AliMpCathodType.cxx +++ b/MUON/mapping/AliMpCathodType.cxx @@ -19,6 +19,8 @@ //_____________________________________________________________________________ AliMp::CathodType AliMp::GetCathodType(Int_t cathodNumber) { +/// Return cathod type for a given cathod number of Int_t type + switch ( cathodNumber ) { case kCath0: return kCath0; break; case kCath1: return kCath1; break; @@ -36,6 +38,8 @@ AliMp::CathodType AliMp::GetCathodType(Int_t cathodNumber) //_____________________________________________________________________________ TString AliMp::CathodTypeName(AliMp::CathodType cathodType) { +/// Return cathod type name for a given cathod type + switch ( cathodType ) { case kCath0: return "cath0"; break; case kCath1: return "cath1"; break; @@ -49,6 +53,8 @@ TString AliMp::CathodTypeName(AliMp::CathodType cathodType) //_____________________________________________________________________________ AliMp::CathodType AliMp::OtherCathodType(AliMp::CathodType cathodType) { +/// Return the other cathod type for a given cathod type + switch ( cathodType ) { case kCath0: return kCath1; break; case kCath1: return kCath0; break; diff --git a/MUON/mapping/AliMpDDLStore.cxx b/MUON/mapping/AliMpDDLStore.cxx index 0828d001eed..51d04613e3d 100644 --- a/MUON/mapping/AliMpDDLStore.cxx +++ b/MUON/mapping/AliMpDDLStore.cxx @@ -110,7 +110,7 @@ AliMpDDLStore* AliMpDDLStore::ReadData(const AliMpDataStreams& dataStreams, //______________________________________________________________________________ AliMpDDLStore::AliMpDDLStore(const AliMpDataStreams& dataStreams) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fDDLs(fgkNofDDLs+fgkNofTriggerDDLs), // FIXEME fBusPatches(), fManuList12(), @@ -141,7 +141,7 @@ AliMpDDLStore::AliMpDDLStore(const AliMpDataStreams& dataStreams) //______________________________________________________________________________ AliMpDDLStore::AliMpDDLStore(TRootIOCtor* ioCtor) : TObject(), - fDataStreams(ioCtor), + fkDataStreams(ioCtor), fDDLs(), fBusPatches(ioCtor), fRegionalTrigger(ioCtor) @@ -209,7 +209,7 @@ Bool_t AliMpDDLStore::ReadDDLs() /// Read ddl <-> bus patch file istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::BusPatchFilePath()); char line[255]; @@ -298,7 +298,7 @@ Bool_t AliMpDDLStore::ReadTrigger() { /// create trigger DDL object and Global crate object - if ( ! fRegionalTrigger.ReadData(fDataStreams) ) return false; + if ( ! fRegionalTrigger.ReadData(fkDataStreams) ) return false; return true; } @@ -477,7 +477,7 @@ Bool_t AliMpDDLStore::ReadBusPatchSpecial() /// and reset the manus arrays filled via SetManu function istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::BusPatchSpecialFilePath()); char line[255]; @@ -584,7 +584,7 @@ Bool_t AliMpDDLStore::ReadBusPatchInfo() /// read the buspatch info file and set buspatch info istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::BusPatchInfoFilePath()); char line[255]; diff --git a/MUON/mapping/AliMpDDLStore.h b/MUON/mapping/AliMpDDLStore.h index ea717eb9f47..0ef7b5a63e6 100644 --- a/MUON/mapping/AliMpDDLStore.h +++ b/MUON/mapping/AliMpDDLStore.h @@ -36,7 +36,7 @@ class TArrayI; class AliMpDDLStore : public TObject { public: - AliMpDDLStore(TRootIOCtor* /*ioCtor*/); + AliMpDDLStore(TRootIOCtor* ioCtor); virtual ~AliMpDDLStore(); // static access method @@ -104,7 +104,7 @@ class AliMpDDLStore : public TObject { static const TString fgkExplicitKeyword; ///< A keyword for ReadBusPatchSpecial() // data members - const AliMpDataStreams& fDataStreams; //!< Data streams + const AliMpDataStreams& fkDataStreams; //!< Data streams TObjArray fDDLs; ///< Array of DDL objects AliMpExMap fBusPatches; ///< The map of bus patches per their IDs TArrayI fManuList12[16]; ///< Arrays of 1st manu in bus diff --git a/MUON/mapping/AliMpDEStore.cxx b/MUON/mapping/AliMpDEStore.cxx index eefadb3246c..2a01b9f2cbc 100644 --- a/MUON/mapping/AliMpDEStore.cxx +++ b/MUON/mapping/AliMpDEStore.cxx @@ -97,7 +97,7 @@ AliMpDEStore* AliMpDEStore::ReadData(const AliMpDataStreams& dataStreams, //______________________________________________________________________________ AliMpDEStore::AliMpDEStore(const AliMpDataStreams& dataStreams) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fDetElements() { /// Standard constructor @@ -112,7 +112,7 @@ AliMpDEStore::AliMpDEStore(const AliMpDataStreams& dataStreams) //______________________________________________________________________________ AliMpDEStore::AliMpDEStore(TRootIOCtor* ioCtor) : TObject(), - fDataStreams(ioCtor), + fkDataStreams(ioCtor), fDetElements(ioCtor) { /// Constructor for IO @@ -162,7 +162,7 @@ AliMpDEStore::ReadDENames(AliMp::StationType station, // Open stream istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::DENamesFilePath(station, station12)); // Read plane types per cathods diff --git a/MUON/mapping/AliMpDEStore.h b/MUON/mapping/AliMpDEStore.h index 9a989969c73..4bead3a2ff3 100644 --- a/MUON/mapping/AliMpDEStore.h +++ b/MUON/mapping/AliMpDEStore.h @@ -32,7 +32,7 @@ class AliMpDEStore : public TObject { friend class AliMpDEIterator; public: - AliMpDEStore(TRootIOCtor* /*ioCtor*/); + AliMpDEStore(TRootIOCtor* ioCtor); virtual ~AliMpDEStore(); // static access method @@ -65,7 +65,7 @@ class AliMpDEStore : public TObject { static const char fgkCommentPrefix; ///< Comment prefix in DE names file // data members - const AliMpDataStreams& fDataStreams; //!< Data streams + const AliMpDataStreams& fkDataStreams; //!< Data streams AliMpExMap fDetElements; ///< Map between DE Ids and DE objects ClassDef(AliMpDEStore,1) // The manager class for definition of detection element types diff --git a/MUON/mapping/AliMpDEVisu.cxx b/MUON/mapping/AliMpDEVisu.cxx index e779a7e24f1..4d35e0addec 100644 --- a/MUON/mapping/AliMpDEVisu.cxx +++ b/MUON/mapping/AliMpDEVisu.cxx @@ -92,7 +92,7 @@ AliMpDEVisu::AliMpDEVisu(UInt_t w, UInt_t h) fCurrentPlane(AliMp::kBendingPlane), fCurrentDetElem(100), fCurrentDEName(), - fSegmentation(), + fkSegmentation(), fDDLStore(0x0), fManuStore(0x0), fZoomMode(false) @@ -270,7 +270,7 @@ AliMpDEVisu::AliMpDEVisu(UInt_t w, UInt_t h) fMain->MapWindow(); // instance segmentation - fSegmentation = AliMpSegmentation::Instance()->GetMpSegmentation(fCurrentDetElem, detElem->GetCathodType(fCurrentPlane)); + fkSegmentation = AliMpSegmentation::Instance()->GetMpSegmentation(fCurrentDetElem, detElem->GetCathodType(fCurrentPlane)); fLogMessage->AddLine("Segmentation loaded"); fLogMessage->ShowBottom(); } @@ -349,7 +349,7 @@ void AliMpDEVisu::HandleMovement(Int_t eventType, Int_t eventX, Int_t eventY, TO EventToReal(eventX,eventY,x,y); // get manu - AliMpPad pad = fSegmentation->PadByPosition(TVector2(x,y), false); + AliMpPad pad = fkSegmentation->PadByPosition(TVector2(x,y), false); if (!pad.IsValid()) { @@ -515,7 +515,7 @@ AliMpDEVisu::EventToReal(Int_t eventX, Int_t eventY, Double_t& x, Double_t& y) c static TVector2 padDim = br - ul; // get DE dimension (half size) - TVector2 deDim(fSegmentation->Dimensions()*2.0); + TVector2 deDim(fkSegmentation->Dimensions()*2.0); TVector2 padReal; @@ -658,7 +658,7 @@ Bool_t AliMpDEVisu::ProcessMessage(Long_t msg, Long_t parm1, Long_t /*parm2*/) fNumberEntry->SetNumber(fNumberEntry->GetIntNumber() - 1024); } DrawDE(); - fSegmentation = AliMpSegmentation::Instance() + fkSegmentation = AliMpSegmentation::Instance() ->GetMpSegmentation(fCurrentDetElem, detElem->GetCathodType(fCurrentPlane)); break; @@ -712,7 +712,7 @@ void AliMpDEVisu::UpdateComboCH() fCurrentDetElem = fDEComboIdx[fDECombo->GetSelected()]; - fSegmentation = AliMpSegmentation::Instance() + fkSegmentation = AliMpSegmentation::Instance() ->GetMpSegmentation(fCurrentDetElem, detElem->GetCathodType(fCurrentPlane)); } @@ -763,7 +763,7 @@ void AliMpDEVisu::UpdateNameView(Bool_t firstTime) } fNameDECombo->Select(fDEOccurrence[fCurrentDetElem]); - fSegmentation = AliMpSegmentation::Instance() + fkSegmentation = AliMpSegmentation::Instance() ->GetMpSegmentation(fCurrentDetElem, detElem->GetCathodType(fCurrentPlane)); } @@ -939,7 +939,7 @@ void AliMpDEVisu::PopUpZoom(Int_t ix0, Int_t iy0, Int_t ix1, Int_t iy1) if ( area.IsValid() ) { - AliMpVPadIterator* iterator = fSegmentation->CreateIterator(area); + AliMpVPadIterator* iterator = fkSegmentation->CreateIterator(area); if (iterator) { AliMpVPainter* painter = AliMpVPainter::CreatePainter(iterator); diff --git a/MUON/mapping/AliMpDEVisu.h b/MUON/mapping/AliMpDEVisu.h index 75a4b5c2e32..0920072604c 100644 --- a/MUON/mapping/AliMpDEVisu.h +++ b/MUON/mapping/AliMpDEVisu.h @@ -102,9 +102,9 @@ private: Int_t fCurrentDetElem; //!< current DE TString fCurrentDEName; //!< current DE name - const AliMpVSegmentation* fSegmentation; //!< segmentation instance - AliMpDDLStore* fDDLStore; //!< DDL Store - AliMpManuStore* fManuStore; //!< Manu Store + const AliMpVSegmentation* fkSegmentation; //!< segmentation instance + AliMpDDLStore* fDDLStore; //!< DDL Store + AliMpManuStore* fManuStore; //!< Manu Store Bool_t fZoomMode; //!< flag for zoom mode on canvas instead of click mode diff --git a/MUON/mapping/AliMpDetElement.h b/MUON/mapping/AliMpDetElement.h index 23341236503..a587d48d6ae 100644 --- a/MUON/mapping/AliMpDetElement.h +++ b/MUON/mapping/AliMpDetElement.h @@ -36,7 +36,7 @@ class AliMpDetElement : public TObject { public: AliMpDetElement(Int_t id, const TString& name, const TString& segType, AliMp::PlaneType planeType); - AliMpDetElement(TRootIOCtor* /*ioCtor*/); + AliMpDetElement(TRootIOCtor* ioCtor); virtual ~AliMpDetElement(); // static methods diff --git a/MUON/mapping/AliMpHVUID.h b/MUON/mapping/AliMpHVUID.h index 008826b8d11..7f1d91c69fc 100644 --- a/MUON/mapping/AliMpHVUID.h +++ b/MUON/mapping/AliMpHVUID.h @@ -1,5 +1,5 @@ -#ifndef AliMpHVUID_H -#define AliMpHVUID_H +#ifndef ALIMPHVUID_H +#define ALIMPHVUID_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/MUON/mapping/AliMpManuStore.cxx b/MUON/mapping/AliMpManuStore.cxx index f0ad34e1006..085609420aa 100644 --- a/MUON/mapping/AliMpManuStore.cxx +++ b/MUON/mapping/AliMpManuStore.cxx @@ -100,7 +100,7 @@ AliMpManuStore* AliMpManuStore::ReadData(const AliMpDataStreams& dataStreams, //______________________________________________________________________________ AliMpManuStore::AliMpManuStore(const AliMpDataStreams& dataStreams) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fManuToSerialNbs(), fSerialNbToManus(), fNofManusInDE(), @@ -124,7 +124,7 @@ AliMpManuStore::AliMpManuStore(const AliMpDataStreams& dataStreams) //______________________________________________________________________________ AliMpManuStore::AliMpManuStore(TRootIOCtor* ioCtor) : TObject(), - fDataStreams(ioCtor), + fkDataStreams(ioCtor), fManuToSerialNbs(), fSerialNbToManus(), fNofManusInDE(), @@ -169,7 +169,7 @@ Bool_t AliMpManuStore::ReadData(const AliMpDetElement* de, Int_t& nofManus) static Int_t manuMask = AliMpConstants::ManuMask(AliMp::kNonBendingPlane); istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream( AliMpFiles::ManuToSerialPath(deName, stationType, station12Type)); diff --git a/MUON/mapping/AliMpManuStore.h b/MUON/mapping/AliMpManuStore.h index 3b99ee7b13a..881c3bd5a93 100644 --- a/MUON/mapping/AliMpManuStore.h +++ b/MUON/mapping/AliMpManuStore.h @@ -29,7 +29,7 @@ class TString; class AliMpManuStore : public TObject { public: - AliMpManuStore(TRootIOCtor* /*ioCtor*/); + AliMpManuStore(TRootIOCtor* ioCtor); virtual ~AliMpManuStore(); // static access method @@ -71,7 +71,7 @@ class AliMpManuStore : public TObject { static Bool_t fgWarnIfDoublon; ///< Option to warn about doublons // data members - const AliMpDataStreams& fDataStreams; //!< Data streams + const AliMpDataStreams& fkDataStreams; //!< Data streams mutable TExMap fManuToSerialNbs; ///< Map from manuId to serial # mutable TExMap fSerialNbToManus; ///< Map manu serial # to manuId mutable TExMap fNofManusInDE; ///< Number of manus with serial nbs in DE diff --git a/MUON/mapping/AliMpMotifMap.h b/MUON/mapping/AliMpMotifMap.h index 56cf91adffd..d6de9df7653 100755 --- a/MUON/mapping/AliMpMotifMap.h +++ b/MUON/mapping/AliMpMotifMap.h @@ -107,6 +107,11 @@ class AliMpMotifMap : public TObject Int_t CalculateNofPads() const; private: + /// Not implemented + AliMpMotifMap(const AliMpMotifMap& rhs); + /// Not implemented + AliMpMotifMap& operator=(const AliMpMotifMap& rhs); + // methods void PrintMotif(const AliMpVMotif* motif) const; void PrintMotifType(const AliMpMotifType* motifType) const; diff --git a/MUON/mapping/AliMpMotifPositionPadIterator.cxx b/MUON/mapping/AliMpMotifPositionPadIterator.cxx index dc9c97f7b38..7b619a4566b 100755 --- a/MUON/mapping/AliMpMotifPositionPadIterator.cxx +++ b/MUON/mapping/AliMpMotifPositionPadIterator.cxx @@ -37,7 +37,7 @@ ClassImp(AliMpMotifPositionPadIterator) //______________________________________________________________________________ AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator(): AliMpVPadIterator(), - fMotifPos(0), + fkMotifPos(0), fIterator() { /// Default constructor, set the current position to "invalid" @@ -48,7 +48,7 @@ AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator(): AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator( const AliMpMotifPosition* motifPos) : AliMpVPadIterator(), - fMotifPos(motifPos), + fkMotifPos(motifPos), fIterator(motifPos->GetMotif()->GetMotifType()) { /// Standard constructor, let *this to invalid position @@ -58,7 +58,7 @@ AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator( AliMpMotifPositionPadIterator::AliMpMotifPositionPadIterator( const AliMpMotifPositionPadIterator& right) : AliMpVPadIterator(right), - fMotifPos(right.fMotifPos), + fkMotifPos(right.fkMotifPos), fIterator(right.fIterator) { @@ -88,7 +88,7 @@ AliMpMotifPositionPadIterator::operator = (const AliMpMotifPositionPadIterator& // base class assignment AliMpVPadIterator::operator=(right); - fMotifPos = right.fMotifPos; + fkMotifPos = right.fkMotifPos; fIterator = right.fIterator; return *this; @@ -102,7 +102,7 @@ Bool_t AliMpMotifPositionPadIterator::IsValid() const { /// Is the iterator in a valid position? - return (fMotifPos!=0) && (!fIterator.IsDone()); + return (fkMotifPos!=0) && (!fIterator.IsDone()); } // @@ -115,7 +115,7 @@ void AliMpMotifPositionPadIterator::First() /// Reset the iterator, so that it points to the first available /// pad in the motif type - if (!fMotifPos) { + if (!fkMotifPos) { Invalidate(); return ; } @@ -145,17 +145,17 @@ AliMpPad AliMpMotifPositionPadIterator::CurrentItem() const { /// Return current pad. - if (!fMotifPos) + if (!fkMotifPos) return AliMpPad::Invalid(); else { AliMpIntPair ind = fIterator.CurrentItem().GetIndices(); - AliMpMotifType* mt = fMotifPos->GetMotif()->GetMotifType(); + AliMpMotifType* mt = fkMotifPos->GetMotif()->GetMotifType(); AliMpConnection* connect = mt->FindConnectionByLocalIndices(ind); - return AliMpPad(AliMpIntPair(fMotifPos->GetID(),connect->GetGassiNum()), - fMotifPos->GlobalIndices(ind), - fMotifPos->Position()+fMotifPos->GetMotif()->PadPositionLocal(ind), - fMotifPos->GetMotif()->GetPadDimensions(ind)); + return AliMpPad(AliMpIntPair(fkMotifPos->GetID(),connect->GetGassiNum()), + fkMotifPos->GlobalIndices(ind), + fkMotifPos->Position()+fkMotifPos->GetMotif()->PadPositionLocal(ind), + fkMotifPos->GetMotif()->GetPadDimensions(ind)); } } diff --git a/MUON/mapping/AliMpMotifPositionPadIterator.h b/MUON/mapping/AliMpMotifPositionPadIterator.h index f29076fd65e..71ca6090f10 100755 --- a/MUON/mapping/AliMpMotifPositionPadIterator.h +++ b/MUON/mapping/AliMpMotifPositionPadIterator.h @@ -41,10 +41,10 @@ class AliMpMotifPositionPadIterator : public AliMpVPadIterator Bool_t IsValid() const; // private data members - const AliMpMotifPosition* fMotifPos; ///< the AliMpMotifPosition over which iterate + const AliMpMotifPosition* fkMotifPos;///< the AliMpMotifPosition over which iterate AliMpMotifTypePadIterator fIterator; ///< Iterator over the motif type - ClassDef(AliMpMotifPositionPadIterator,1) // iterator over motif's pads + ClassDef(AliMpMotifPositionPadIterator,2) // iterator over motif's pads }; #endif // ALI_MP_MOTIF_POSITION_PAD_ITERATOR_H diff --git a/MUON/mapping/AliMpMotifReader.cxx b/MUON/mapping/AliMpMotifReader.cxx index 543c86178e0..e909e8d6205 100644 --- a/MUON/mapping/AliMpMotifReader.cxx +++ b/MUON/mapping/AliMpMotifReader.cxx @@ -56,7 +56,7 @@ AliMpMotifReader::AliMpMotifReader(const AliMpDataStreams& dataStreams, AliMq::Station12Type station12, AliMp::PlaneType plane) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fStationType(station), fStation12Type(station12), fPlaneType(plane) @@ -85,15 +85,15 @@ AliMpMotifType* AliMpMotifReader::BuildMotifType(const TString& motifTypeId) // Open streams // istream& padPosStream - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::PadPosFilePath( fStationType, fStation12Type, fPlaneType, motifTypeId)); istream& bergToGCStream - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::BergToGCFilePath(fStationType, fStation12Type)); istream& motifTypeStream - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::MotifFilePath( fStationType, fStation12Type, fPlaneType, motifTypeId)); @@ -262,7 +262,7 @@ AliMpMotifReader::BuildMotifSpecial(const TString& motifID, // Open streams // istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::MotifSpecialFilePath( fStationType, fStation12Type, fPlaneType, motifID)); diff --git a/MUON/mapping/AliMpMotifReader.h b/MUON/mapping/AliMpMotifReader.h index 13c7cc57af3..aad229fba42 100644 --- a/MUON/mapping/AliMpMotifReader.h +++ b/MUON/mapping/AliMpMotifReader.h @@ -78,7 +78,7 @@ class AliMpMotifReader : public TObject AliMpMotifReader& operator = (const AliMpMotifReader& right); // data members - const AliMpDataStreams& fDataStreams; ///< data streams + const AliMpDataStreams& fkDataStreams;///< data streams AliMp::StationType fStationType; ///< station type AliMq::Station12Type fStation12Type; ///< station12 type AliMp::PlaneType fPlaneType; ///< plane type diff --git a/MUON/mapping/AliMpMotifTypePadIterator.cxx b/MUON/mapping/AliMpMotifTypePadIterator.cxx index 0398d1afdb8..f03d8970f09 100755 --- a/MUON/mapping/AliMpMotifTypePadIterator.cxx +++ b/MUON/mapping/AliMpMotifTypePadIterator.cxx @@ -35,7 +35,7 @@ ClassImp(AliMpMotifTypePadIterator) //______________________________________________________________________________ AliMpMotifTypePadIterator::AliMpMotifTypePadIterator(): AliMpVPadIterator(), - fMotifType(0), + fkMotifType(0), fCurrentPosition(AliMpIntPair::Invalid()) { /// Default constructor, set the current position to "invalid" @@ -45,7 +45,7 @@ AliMpMotifTypePadIterator::AliMpMotifTypePadIterator(): AliMpMotifTypePadIterator::AliMpMotifTypePadIterator( const AliMpMotifType* motifType) : AliMpVPadIterator(), - fMotifType(motifType), + fkMotifType(motifType), fCurrentPosition(AliMpIntPair::Invalid()) { /// Standard constructor, let *this to invalid position @@ -55,7 +55,7 @@ AliMpMotifTypePadIterator::AliMpMotifTypePadIterator( AliMpMotifTypePadIterator::AliMpMotifTypePadIterator( const AliMpMotifTypePadIterator& right) : AliMpVPadIterator(right), - fMotifType(right.fMotifType), + fkMotifType(right.fkMotifType), fCurrentPosition(right.fCurrentPosition) { @@ -84,7 +84,7 @@ AliMpMotifTypePadIterator::operator = (const AliMpMotifTypePadIterator& right) // base class assignment AliMpVPadIterator::operator=(right); - fMotifType = right.fMotifType; + fkMotifType = right.fkMotifType; fCurrentPosition = right.fCurrentPosition; return *this; @@ -102,10 +102,10 @@ AliMpMotifTypePadIterator::FindFirstPadInLine(AliMpIntPair indices) const /// as the \a indices, and in column, at least equal, to the /// one of \a indices - if (!fMotifType) return AliMpIntPair::Invalid(); + if (!fkMotifType) return AliMpIntPair::Invalid(); - while (indices.GetFirst() < fMotifType->GetNofPadsX()) { - if (fMotifType->HasPad(indices)) return indices; + while (indices.GetFirst() < fkMotifType->GetNofPadsX()) { + if (fkMotifType->HasPad(indices)) return indices; indices += AliMpIntPair(1,0); } return AliMpIntPair::Invalid(); @@ -116,7 +116,7 @@ Bool_t AliMpMotifTypePadIterator::IsValid() const { /// Is the iterator in a valid position? - return fMotifType!=0 && fCurrentPosition.IsValid(); + return fkMotifType!=0 && fCurrentPosition.IsValid(); } // @@ -129,12 +129,12 @@ void AliMpMotifTypePadIterator::First() /// Reset the iterator, so that it points to the first available /// pad in the motif type - if (!fMotifType) { + if (!fkMotifType) { Invalidate(); return ; } fCurrentPosition = AliMpIntPair(0,0); - if (fMotifType->HasPad(fCurrentPosition)) return; + if (fkMotifType->HasPad(fCurrentPosition)) return; // if (0,0) is not available @@ -153,7 +153,7 @@ void AliMpMotifTypePadIterator::Next() //if (!IsValid()) return *this; if (!IsValid()) return; - while (fCurrentPosition.GetSecond() < fMotifType->GetNofPadsY()){ + while (fCurrentPosition.GetSecond() < fkMotifType->GetNofPadsY()){ AliMpIntPair nextTry = FindFirstPadInLine(fCurrentPosition + AliMpIntPair(1,0)); if (nextTry.IsValid()){ @@ -182,7 +182,7 @@ AliMpPad AliMpMotifTypePadIterator::CurrentItem() const { /// Return current pad. - if (!fMotifType) + if (!fkMotifType) return AliMpPad::Invalid(); else return AliMpPad(AliMpIntPair::Invalid(), diff --git a/MUON/mapping/AliMpMotifTypePadIterator.h b/MUON/mapping/AliMpMotifTypePadIterator.h index e12fadf1291..f41c6fe0728 100755 --- a/MUON/mapping/AliMpMotifTypePadIterator.h +++ b/MUON/mapping/AliMpMotifTypePadIterator.h @@ -42,10 +42,10 @@ class AliMpMotifTypePadIterator : public AliMpVPadIterator Bool_t IsValid() const; // private data members - const AliMpMotifType* fMotifType;///< the motif type over which iterate - AliMpIntPair fCurrentPosition; ///< the current position inside the motif type + const AliMpMotifType* fkMotifType;///< the motif type over which iterate + AliMpIntPair fCurrentPosition; ///< the current position inside the motif type - ClassDef(AliMpMotifTypePadIterator,1) // iterator over motif's pads + ClassDef(AliMpMotifTypePadIterator,2) // iterator over motif's pads }; #endif // ALI_MP_MOTIF_TYPE_PAD_ITERATOR_H diff --git a/MUON/mapping/AliMpPlaneType.cxx b/MUON/mapping/AliMpPlaneType.cxx index 595cefaf01e..ac019f2e2b8 100644 --- a/MUON/mapping/AliMpPlaneType.cxx +++ b/MUON/mapping/AliMpPlaneType.cxx @@ -16,6 +16,8 @@ //_____________________________________________________________________________ TString AliMp::PlaneTypeName(PlaneType planeType) { +/// Return plane type name for given plane type + switch ( planeType ) { case kBendingPlane: return "bp"; break; case kNonBendingPlane: return "nbp"; break; @@ -29,6 +31,8 @@ TString AliMp::PlaneTypeName(PlaneType planeType) //_____________________________________________________________________________ AliMp::PlaneType AliMp::OtherPlaneType(PlaneType planeType) { +/// Return the other plane type for a given plane type + switch ( planeType ) { case kBendingPlane: return kNonBendingPlane; break; case kNonBendingPlane: return kBendingPlane; break; diff --git a/MUON/mapping/AliMpSectorReader.cxx b/MUON/mapping/AliMpSectorReader.cxx index 1a6b2ea0211..a6015c4bdea 100755 --- a/MUON/mapping/AliMpSectorReader.cxx +++ b/MUON/mapping/AliMpSectorReader.cxx @@ -78,7 +78,7 @@ AliMpSectorReader::AliMpSectorReader(const AliMpDataStreams& dataStreams, AliMq::Station12Type station, AliMp::PlaneType plane) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fStationType(station), fPlaneType(plane), fSector(0), @@ -529,7 +529,7 @@ AliMpSector* AliMpSectorReader::BuildSector() // Open input stream // istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::SectorFilePath(fStationType,fPlaneType)); ReadSectorData(in); @@ -543,9 +543,9 @@ AliMpSector* AliMpSectorReader::BuildSector() TString sectorSpecialFileName = AliMpFiles::SectorSpecialFilePath(fStationType, fPlaneType); - if ( fDataStreams.IsDataStream(sectorSpecialFileName) ) { + if ( fkDataStreams.IsDataStream(sectorSpecialFileName) ) { istream& in2 - = fDataStreams. + = fkDataStreams. CreateDataStream(sectorSpecialFileName); ReadSectorSpecialData(in2, AliMp::kLeft); @@ -556,9 +556,9 @@ AliMpSector* AliMpSectorReader::BuildSector() // Open input file for special outer zone TString sectorSpecialFileName2 = AliMpFiles::SectorSpecialFilePath2(fStationType, fPlaneType); - if ( fDataStreams.IsDataStream(sectorSpecialFileName2) ) { + if ( fkDataStreams.IsDataStream(sectorSpecialFileName2) ) { istream& in3 - = fDataStreams. + = fkDataStreams. CreateDataStream(sectorSpecialFileName2); ReadSectorSpecialData(in3, AliMp::kRight); diff --git a/MUON/mapping/AliMpSectorReader.h b/MUON/mapping/AliMpSectorReader.h index 50f8455d915..c84c3f5843b 100755 --- a/MUON/mapping/AliMpSectorReader.h +++ b/MUON/mapping/AliMpSectorReader.h @@ -80,7 +80,7 @@ class AliMpSectorReader : public TObject static const TString fgkPadRowSegmentKeyword; ///< pad row segment keyword // data members - const AliMpDataStreams& fDataStreams; ///< data streams + const AliMpDataStreams& fkDataStreams; ///< data streams AliMq::Station12Type fStationType; ///< station type AliMp::PlaneType fPlaneType; ///< plane type AliMpSector* fSector; ///< sector diff --git a/MUON/mapping/AliMpSegmentation.cxx b/MUON/mapping/AliMpSegmentation.cxx index 19b312800b6..de55f2eead9 100644 --- a/MUON/mapping/AliMpSegmentation.cxx +++ b/MUON/mapping/AliMpSegmentation.cxx @@ -105,7 +105,7 @@ AliMpSegmentation* AliMpSegmentation::ReadData(const AliMpDataStreams& dataStrea //______________________________________________________________________________ AliMpSegmentation::AliMpSegmentation(const AliMpDataStreams& dataStreams) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fDetElements(0), fMpSegmentations(true), fElCardsMap(), @@ -146,7 +146,7 @@ AliMpSegmentation::AliMpSegmentation(const AliMpDataStreams& dataStreams) //______________________________________________________________________________ AliMpSegmentation::AliMpSegmentation(TRootIOCtor* ioCtor) : TObject(), - fDataStreams(ioCtor), + fkDataStreams(ioCtor), fDetElements(0), fMpSegmentations(), fElCardsMap(ioCtor), @@ -211,17 +211,17 @@ AliMpSegmentation::CreateMpSegmentation(Int_t detElemId, AliMp::CathodType cath) if ( stationType == AliMp::kStation12 ) { AliMq::Station12Type station12Type = detElement->GetStation12Type(); - AliMpSectorReader reader(fDataStreams, station12Type, planeType); + AliMpSectorReader reader(fkDataStreams, station12Type, planeType); AliMpSector* sector = reader.BuildSector(); mpSegmentation = new AliMpSectorSegmentation(sector, true); } else if ( stationType == AliMp::kStation345 ) { - AliMpSt345Reader reader(fDataStreams,fSlatMotifMap); + AliMpSt345Reader reader(fkDataStreams,fSlatMotifMap); AliMpSlat* slat = reader.ReadSlat(deTypeName, planeType); mpSegmentation = new AliMpSlatSegmentation(slat, true); } else if ( stationType == AliMp::kStationTrigger ) { - AliMpTriggerReader reader(fDataStreams,fSlatMotifMap); + AliMpTriggerReader reader(fkDataStreams,fSlatMotifMap); AliMpTrigger* trigger = reader.ReadSlat(deTypeName, planeType); mpSegmentation = new AliMpTriggerSegmentation(trigger, true); } diff --git a/MUON/mapping/AliMpSegmentation.h b/MUON/mapping/AliMpSegmentation.h index 08a4e71f555..914765f528b 100644 --- a/MUON/mapping/AliMpSegmentation.h +++ b/MUON/mapping/AliMpSegmentation.h @@ -50,7 +50,7 @@ class TRootIOCtor; class AliMpSegmentation : public TObject { public: - AliMpSegmentation(TRootIOCtor* /*ioCtor*/); + AliMpSegmentation(TRootIOCtor* ioCtor); virtual ~AliMpSegmentation(); // static methods @@ -113,7 +113,7 @@ class AliMpSegmentation : public TObject { static AliMpSegmentation* fgInstance; ///< Singleton instance // data members - const AliMpDataStreams& fDataStreams; //!< Data streams + const AliMpDataStreams& fkDataStreams; //!< Data streams AliMpDEStore* fDetElements; ///< Detection element store AliMpStringObjMap fMpSegmentations;///< Map of mapping segmentations to DE seg names AliMpExMap fElCardsMap; ///< Map of el. cards IDs to segmentations diff --git a/MUON/mapping/AliMpSt345Reader.cxx b/MUON/mapping/AliMpSt345Reader.cxx index 321d9993c2d..04fec74b43a 100644 --- a/MUON/mapping/AliMpSt345Reader.cxx +++ b/MUON/mapping/AliMpSt345Reader.cxx @@ -59,7 +59,7 @@ ClassImp(AliMpSt345Reader) AliMpSt345Reader::AliMpSt345Reader(const AliMpDataStreams& dataStreams, AliMpSlatMotifMap* motifMap) : TObject(), -fDataStreams(dataStreams), +fkDataStreams(dataStreams), fMotifMap(motifMap) { /// @@ -84,11 +84,11 @@ AliMpSt345Reader::ReadPCB(const char* pcbType) /// The returned object must be deleted by the client istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::SlatPCBFilePath( AliMp::kStation345, pcbType)); - AliMpMotifReader reader(fDataStreams, + AliMpMotifReader reader(fkDataStreams, AliMp::kStation345, AliMq::kNotSt12, AliMp::kNonBendingPlane); // note that the nonbending // parameter is of no use for station345, as far as reading motif is @@ -163,7 +163,7 @@ AliMpSt345Reader::ReadSlat(const char* slatType, AliMp::PlaneType planeType) /// The returned object must be deleted by the client. istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::SlatFilePath( AliMp::kStation345, slatType, planeType)); diff --git a/MUON/mapping/AliMpSt345Reader.h b/MUON/mapping/AliMpSt345Reader.h index 638a46029dd..5d79e418923 100644 --- a/MUON/mapping/AliMpSt345Reader.h +++ b/MUON/mapping/AliMpSt345Reader.h @@ -52,7 +52,7 @@ private: /// Not implemented AliMpSt345Reader& operator=(const AliMpSt345Reader& rhs); - const AliMpDataStreams& fDataStreams; ///< data streams + const AliMpDataStreams& fkDataStreams; ///< data streams AliMpSlatMotifMap* fMotifMap; //!< storage for motifTypes and motifs... ClassDef(AliMpSt345Reader,0) // Reader for slat stations mapping files diff --git a/MUON/mapping/AliMpStation12Type.cxx b/MUON/mapping/AliMpStation12Type.cxx index 4dfad68457e..19ee3e0cc12 100644 --- a/MUON/mapping/AliMpStation12Type.cxx +++ b/MUON/mapping/AliMpStation12Type.cxx @@ -17,6 +17,8 @@ //_____________________________________________________________________________ TString AliMq::Station12TypeName(AliMq::Station12Type station12Type) { +/// Return the station12 name for given station12 type + switch ( station12Type ) { case kStation1: return "st1"; break; case kStation2: return "st2"; break; diff --git a/MUON/mapping/AliMpStationType.cxx b/MUON/mapping/AliMpStationType.cxx index abec3dfa835..4cbbffd0dcd 100644 --- a/MUON/mapping/AliMpStationType.cxx +++ b/MUON/mapping/AliMpStationType.cxx @@ -18,6 +18,8 @@ //_____________________________________________________________________________ TString AliMp::StationTypeName(AliMp::StationType stationType) { +/// Return the station name for given station type + switch ( stationType ) { case kStation12: return "st12"; break; case kStation345: return "slat"; break; diff --git a/MUON/mapping/AliMpTriggerReader.cxx b/MUON/mapping/AliMpTriggerReader.cxx index 3889953e7c6..a7d433a93a7 100644 --- a/MUON/mapping/AliMpTriggerReader.cxx +++ b/MUON/mapping/AliMpTriggerReader.cxx @@ -66,7 +66,7 @@ const TString AliMpTriggerReader::fgkKeywordFlipY("FLIP_Y"); //_____________________________________________________________________________ AliMpTriggerReader::AliMpTriggerReader(const AliMpDataStreams& dataStreams, AliMpSlatMotifMap* motifMap) : TObject(), - fDataStreams(dataStreams), + fkDataStreams(dataStreams), fMotifMap(motifMap), fLocalBoardMap() { @@ -468,7 +468,7 @@ AliMpTriggerReader::ReadLines(const char* slatType, srcLine,destLine)); istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::SlatFilePath( AliMp::kStationTrigger,slatType, planeType)); @@ -546,7 +546,7 @@ AliMpTriggerReader::ReadLocalBoardMapping() UShort_t mask; istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::LocalTriggerBoardMapping()); char line[80]; @@ -611,11 +611,11 @@ AliMpTriggerReader::ReadPCB(const char* pcbType) } istream& in - = fDataStreams. + = fkDataStreams. CreateDataStream(AliMpFiles::SlatPCBFilePath( AliMp::kStationTrigger,pcbName)); - AliMpMotifReader reader(fDataStreams, + AliMpMotifReader reader(fkDataStreams, AliMp::kStationTrigger, AliMq::kNotSt12, AliMp::kNonBendingPlane); // note that the nonbending // parameter is of no use for trigger, as far as reading motif is diff --git a/MUON/mapping/AliMpTriggerReader.h b/MUON/mapping/AliMpTriggerReader.h index ed945fe259b..f9ce61d8777 100644 --- a/MUON/mapping/AliMpTriggerReader.h +++ b/MUON/mapping/AliMpTriggerReader.h @@ -88,7 +88,7 @@ private: /// Not implemented AliMpTriggerReader& operator=(const AliMpTriggerReader& rhs); - const AliMpDataStreams& fDataStreams; //!< data streams + const AliMpDataStreams& fkDataStreams; //!< data streams AliMpSlatMotifMap* fMotifMap; //!< storage for motifTypes and motifs... TMap fLocalBoardMap; //!< map of TObjString to TObjString