From afae965055d2e67bc16f0cbfcb0eec7cb77a40c1 Mon Sep 17 00:00:00 2001 From: dsilverm Date: Tue, 29 Nov 2011 17:22:05 +0000 Subject: [PATCH] attempt to address RuleChecker reports re. comments etc --- EMCAL/AliCaloCalibPedestal.cxx | 8 +- EMCAL/AliCaloCalibSignal.cxx | 4 +- EMCAL/AliCaloCalibSignal.h | 6 +- EMCAL/AliCaloNeuralFit.h | 2 +- EMCAL/AliCaloRawAnalyzerComparison.h | 2 +- EMCAL/AliCaloRawAnalyzerPeakFinder.cxx | 5 +- EMCAL/AliCaloRawAnalyzerPeakFinder.h | 2 +- EMCAL/AliEMCALBiasAPD.cxx | 2 +- EMCAL/AliEMCALCalibAbs.cxx | 2 +- EMCAL/AliEMCALCalibMapAPD.cxx | 2 +- EMCAL/AliEMCALCalibReference.cxx | 2 +- EMCAL/AliEMCALCalibTempCoeff.cxx | 2 +- EMCAL/AliEMCALCalibTimeDepCorrection.cxx | 2 +- EMCAL/AliEMCALCalibTimeDepCorrection.h | 4 +- EMCAL/AliEMCALGeoParams.h | 6 +- EMCAL/AliEMCALQAChecker.cxx | 14 +- EMCAL/AliEMCALQAChecker.h | 16 +- EMCAL/AliEMCALQADataMakerRec.cxx | 207 +++++++++++------------ EMCAL/AliEMCALQADataMakerRec.h | 8 +- EMCAL/AliEMCALSensorTemp.cxx | 3 +- EMCAL/AliEMCALSensorTempArray.h | 4 +- EMCAL/EMCALLEDda.cxx | 2 +- EMCAL/EMCALPEDda.cxx | 2 +- 23 files changed, 146 insertions(+), 161 deletions(-) diff --git a/EMCAL/AliCaloCalibPedestal.cxx b/EMCAL/AliCaloCalibPedestal.cxx index 8d84dedf744..65321bae6a6 100644 --- a/EMCAL/AliCaloCalibPedestal.cxx +++ b/EMCAL/AliCaloCalibPedestal.cxx @@ -361,9 +361,8 @@ AliCaloCalibPedestal& AliCaloCalibPedestal::operator = (AliCaloCalibPedestal &so //_____________________________________________________________________ void AliCaloCalibPedestal::Reset() -{ +{ // Reset all arrays/histograms ValidateProfiles(); // make sure histos/profiles exist - // Reset all arrays/histograms for (int i = 0; i < fModules; i++) { GetPedProfileLowGain(i)->Reset(); GetPedProfileHighGain(i)->Reset(); @@ -756,7 +755,7 @@ Bool_t AliCaloCalibPedestal::LoadReferenceCalib(TString fileName, TString object //_____________________________________________________________________ Bool_t AliCaloCalibPedestal::SetReference(AliCaloCalibPedestal *ref) -{ +{ // set reference object if (fReference) delete fReference;//Delete the reference object, if it already exists fReference = 0; @@ -891,8 +890,7 @@ void AliCaloCalibPedestal::ValidateComparisonProfiles() //_____________________________________________________________________ void AliCaloCalibPedestal::ComputeDiffAndRatio() -{ - // calculate differences and ratios relative to a reference +{ // calculate differences and ratios relative to a reference ValidateProfiles(); // make sure histos/profiles exist ValidateComparisonProfiles();//Make sure the comparison histos exist diff --git a/EMCAL/AliCaloCalibSignal.cxx b/EMCAL/AliCaloCalibSignal.cxx index b7142cee656..ddefc5f173c 100644 --- a/EMCAL/AliCaloCalibSignal.cxx +++ b/EMCAL/AliCaloCalibSignal.cxx @@ -247,7 +247,7 @@ void AliCaloCalibSignal::Zero() //_____________________________________________________________________ Bool_t AliCaloCalibSignal::CheckFractionAboveAmp(const int *iAmpVal, - int resultArray[]) + int resultArray[]) const { // check fraction of towers, per column, that are above amplitude cut Bool_t returnCode = false; @@ -283,7 +283,7 @@ Bool_t AliCaloCalibSignal::CheckFractionAboveAmp(const int *iAmpVal, //_____________________________________________________________________ Bool_t AliCaloCalibSignal::CheckLEDRefAboveAmp(const int *iAmpVal, - int resultArray[]) + int resultArray[]) const { // check which LEDRef/Mon strips are above amplitude cut Bool_t returnCode = false; diff --git a/EMCAL/AliCaloCalibSignal.h b/EMCAL/AliCaloCalibSignal.h index 7c8b81f8a8f..bcba08f118a 100644 --- a/EMCAL/AliCaloCalibSignal.h +++ b/EMCAL/AliCaloCalibSignal.h @@ -47,8 +47,8 @@ public: // Event processing methods: Bool_t ProcessEvent(AliRawReader *rawReader); Bool_t ProcessEvent(AliCaloRawStreamV3 *in, UInt_t Timestamp); // added header for time info - Bool_t CheckFractionAboveAmp(const int *AmpVal, int resultArray[]); // check fraction of signals to check for LED events - Bool_t CheckLEDRefAboveAmp(const int *AmpVal, int resultArray[]); // check if LED Ref is also above cut + Bool_t CheckFractionAboveAmp(const int *AmpVal, int resultArray[]) const; // check fraction of signals to check for LED events + Bool_t CheckLEDRefAboveAmp(const int *AmpVal, int resultArray[]) const; // check if LED Ref is also above cut // Mapping handling AliCaloAltroMapping **GetAltroMapping() const { return fMapping; }; @@ -75,7 +75,7 @@ public: int GetNLowGain(int towId) const { return fNLowGain[towId];}; //! // also for LED reference - int GetNRef(const int imod, const int istripMod, const int igain) //! + int GetNRef(const int imod, const int istripMod, const int igain) const //! { int refId = GetRefNum(imod, istripMod, igain); return fNRef[refId];}; //! int GetNRef(int refId) const { return fNRef[refId];}; //! diff --git a/EMCAL/AliCaloNeuralFit.h b/EMCAL/AliCaloNeuralFit.h index 32623887ae9..f58a6a97875 100644 --- a/EMCAL/AliCaloNeuralFit.h +++ b/EMCAL/AliCaloNeuralFit.h @@ -23,7 +23,7 @@ public: AliCaloNeuralFit(): fInput0(0.0), fInput1(0.0), fInput2(0.0), fInput3(0.0), fInput4(0.0) {} ~AliCaloNeuralFit() {} Double_t Value(int index, Double_t in0, Double_t in1, Double_t in2, Double_t in3, Double_t in4); - Double_t Value(int index, Double_t* input) { return Value(index, input[0], input[1], input[2], input[3], input[4]); } + Double_t Value(int index, const Double_t* input) { return Value(index, input[0], input[1], input[2], input[3], input[4]); } private: Double_t fInput0; // neural network input neuron #1 Double_t fInput1; // neural network input neuron #2 diff --git a/EMCAL/AliCaloRawAnalyzerComparison.h b/EMCAL/AliCaloRawAnalyzerComparison.h index 6a7fcb82c82..99951168b94 100644 --- a/EMCAL/AliCaloRawAnalyzerComparison.h +++ b/EMCAL/AliCaloRawAnalyzerComparison.h @@ -51,7 +51,7 @@ class AliCaloRawAnalyzerComparison void IntiHistograms( std::vector analyzers, AliCaloRawAnalyzer* ref ); - TH1D *fAmpHistograms[NANALYZERS][NZCOLSSMOD][NXROWSSMOD]; + TH1D *fAmpHistograms[NANALYZERS][NZCOLSSMOD][NXROWSSMOD]; // amplitude histos TH2D *fAmplitudeVsEvent[NANALYZERS]; // Amplitude vs envent number TH2D *fTofVsEvent[NANALYZERS]; // Tof vs event number diff --git a/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx b/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx index 6b7771dd15d..0d58208cf76 100644 --- a/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx +++ b/EMCAL/AliCaloRawAnalyzerPeakFinder.cxx @@ -269,8 +269,7 @@ AliCaloRawAnalyzerPeakFinder::LoadVectorsOCDB() void AliCaloRawAnalyzerPeakFinder::WriteRootFile() const -{ - // Utility function to write Peak-Finder vectors to an root file +{ // Utility function to write Peak-Finder vectors to an root file // The output is used to create an OCDB entry. fPeakFinderVectors->PrintVectors(); TFile *f = new TFile("peakfindervectors2.root", "recreate" ); @@ -282,7 +281,7 @@ AliCaloRawAnalyzerPeakFinder::WriteRootFile() const void AliCaloRawAnalyzerPeakFinder::PrintVectors() -{ +{ // Utility function to write Peak-Finder vectors for(int i=0; i < 20; i++) { for( int j = 0; j < PF::MAXSTART; j ++ ) diff --git a/EMCAL/AliCaloRawAnalyzerPeakFinder.h b/EMCAL/AliCaloRawAnalyzerPeakFinder.h index 8276e2eb0ec..7e92d0746b9 100644 --- a/EMCAL/AliCaloRawAnalyzerPeakFinder.h +++ b/EMCAL/AliCaloRawAnalyzerPeakFinder.h @@ -55,7 +55,7 @@ class AliCaloRawAnalyzerPeakFinder : public AliCaloRawAnalyzer Double_t fPFTofVectors[PF::MAXSTART][PF::SAMPLERANGE][100]; // Vectors for TOF extraction, second iteration AliCaloPeakFinderVectors *fPeakFinderVectors; // Collection of Peak-Fincer vectors bool fRunOnAlien; // Wether or not we are running on the GRID - bool fIsInitialized; + bool fIsInitialized; // init flag ClassDef( AliCaloRawAnalyzerPeakFinder, 1 ) }; diff --git a/EMCAL/AliEMCALBiasAPD.cxx b/EMCAL/AliEMCALBiasAPD.cxx index 1814155e9a6..760f63b4901 100644 --- a/EMCAL/AliEMCALBiasAPD.cxx +++ b/EMCAL/AliEMCALBiasAPD.cxx @@ -284,7 +284,7 @@ AliEMCALBiasAPD::~AliEMCALBiasAPD() //____________________________________________________________________________ AliEMCALSuperModuleBiasAPD * AliEMCALBiasAPD::GetSuperModuleBiasAPDNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibAbs.cxx b/EMCAL/AliEMCALCalibAbs.cxx index 828a125537b..4313b481749 100644 --- a/EMCAL/AliEMCALCalibAbs.cxx +++ b/EMCAL/AliEMCALCalibAbs.cxx @@ -333,7 +333,7 @@ AliEMCALCalibAbs::~AliEMCALCalibAbs() //____________________________________________________________________________ AliEMCALSuperModuleCalibAbs * AliEMCALCalibAbs::GetSuperModuleCalibAbsNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibMapAPD.cxx b/EMCAL/AliEMCALCalibMapAPD.cxx index 4e9af8fc119..51791fb6d68 100644 --- a/EMCAL/AliEMCALCalibMapAPD.cxx +++ b/EMCAL/AliEMCALCalibMapAPD.cxx @@ -334,7 +334,7 @@ AliEMCALCalibMapAPD::~AliEMCALCalibMapAPD() //____________________________________________________________________________ AliEMCALSuperModuleCalibMapAPD * AliEMCALCalibMapAPD::GetSuperModuleCalibMapAPDNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibReference.cxx b/EMCAL/AliEMCALCalibReference.cxx index 82639979c4f..a131a4a97ae 100644 --- a/EMCAL/AliEMCALCalibReference.cxx +++ b/EMCAL/AliEMCALCalibReference.cxx @@ -439,7 +439,7 @@ AliEMCALCalibReference::~AliEMCALCalibReference() //____________________________________________________________________________ AliEMCALSuperModuleCalibReference * AliEMCALCalibReference::GetSuperModuleCalibReferenceNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibTempCoeff.cxx b/EMCAL/AliEMCALCalibTempCoeff.cxx index a91fb8bb789..518b266c223 100644 --- a/EMCAL/AliEMCALCalibTempCoeff.cxx +++ b/EMCAL/AliEMCALCalibTempCoeff.cxx @@ -308,7 +308,7 @@ AliEMCALCalibTempCoeff::~AliEMCALCalibTempCoeff() //____________________________________________________________________________ AliEMCALSuperModuleCalibTempCoeff * AliEMCALCalibTempCoeff::GetSuperModuleCalibTempCoeffNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx index fcf71550029..b7bd1b42f14 100644 --- a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx +++ b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx @@ -370,7 +370,7 @@ AliEMCALCalibTimeDepCorrection::~AliEMCALCalibTimeDepCorrection() //____________________________________________________________________________ AliEMCALSuperModuleCalibTimeDepCorrection * AliEMCALCalibTimeDepCorrection::GetSuperModuleCalibTimeDepCorrectionNum(Int_t supModIndex)const -{ +{ // getter via index for (int i=0; iGetSuperModuleNum() == supModIndex) { diff --git a/EMCAL/AliEMCALCalibTimeDepCorrection.h b/EMCAL/AliEMCALCalibTimeDepCorrection.h index 4e5a37be3c3..fb106009bff 100644 --- a/EMCAL/AliEMCALCalibTimeDepCorrection.h +++ b/EMCAL/AliEMCALCalibTimeDepCorrection.h @@ -38,8 +38,8 @@ class AliEMCALSuperModuleCalibTimeDepCorrection : public TObject { { return &fCorrection[icol][irow]; }; private: - Int_t fSuperModuleNum; - TArrayF fCorrection[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; + Int_t fSuperModuleNum; // SM id + TArrayF fCorrection[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // values ClassDef(AliEMCALSuperModuleCalibTimeDepCorrection, 2) // help class }; diff --git a/EMCAL/AliEMCALGeoParams.h b/EMCAL/AliEMCALGeoParams.h index a5c2488228b..18b4a1c4c52 100644 --- a/EMCAL/AliEMCALGeoParams.h +++ b/EMCAL/AliEMCALGeoParams.h @@ -37,9 +37,9 @@ public: static const int fgkEMCALTRURows = 4; static const int fgkEMCALTRUCols = 24; - //STU numbers - static const int fgkEMCALSTUCols = 48; - static const int fgkEMCALSTURows = 64; + //STU numbers + static const int fgkEMCALSTUCols = 48; // STU columns + static const int fgkEMCALSTURows = 64; // STU rows // RAW/AliCaloAltroMapping provides the correspondence information between // an electronics HWAddress (Branch<<1 | FEC<<7 | ALTRO<<4 | Channel) diff --git a/EMCAL/AliEMCALQAChecker.cxx b/EMCAL/AliEMCALQAChecker.cxx index c30c407f605..32ca9caeb57 100644 --- a/EMCAL/AliEMCALQAChecker.cxx +++ b/EMCAL/AliEMCALQAChecker.cxx @@ -54,7 +54,7 @@ ClassImp(AliEMCALQAChecker) //__________________________________________________________________ AliEMCALQAChecker::AliEMCALQAChecker() : AliQACheckerBase("EMCAL","EMCAL Quality Assurance Data Maker"), -fTextSM(new TText*[fknSM]), +fTextSM(new TText*[fgknSM]), fLineCol(new TLine(47.5,-0.5,47.5,119.5)), fText(new TPaveText(0.2,0.7,0.8,0.9,"NDC")) { @@ -96,12 +96,12 @@ AliEMCALQAChecker::~AliEMCALQAChecker() //__________________________________________________________________ AliEMCALQAChecker::AliEMCALQAChecker(const AliEMCALQAChecker& qac) : AliQACheckerBase(qac.GetName(), qac.GetTitle()), -fTextSM(new TText*[fknSM]) , +fTextSM(new TText*[fgknSM]) , fLineCol(static_cast(qac.fLineCol->Clone())) , fText(new TPaveText(0.2,0.7,0.8,0.9,"NDC")) { // copy ctor - for (Int_t sm = 0 ; sm < fknSM ; sm++){ + for (Int_t sm = 0 ; sm < fgknSM ; sm++){ fTextSM[sm] = static_cast(qac.fTextSM[sm]->Clone()) ; } for(Int_t i = 0 ; i < 4 ; i++) { @@ -113,10 +113,10 @@ fText(new TPaveText(0.2,0.7,0.8,0.9,"NDC")) AliEMCALQAChecker& AliEMCALQAChecker::operator = (const AliEMCALQAChecker &qac) { AliQACheckerBase(qac.GetName(), qac.GetTitle()); - fTextSM = new TText*[fknSM] ; + fTextSM = new TText*[fgknSM] ; fLineCol = static_cast(qac.fLineCol->Clone()) ; fText = new TPaveText(0.2,0.7,0.8,0.9,"NDC") ; - for (Int_t sm = 0 ; sm < fknSM ; sm++){ + for (Int_t sm = 0 ; sm < fgknSM ; sm++){ fTextSM[sm] = static_cast(qac.fTextSM[sm]->Clone()) ; } for(Int_t i = 0; i < 4; i++) { @@ -189,7 +189,7 @@ void AliEMCALQAChecker::CheckRaws(Double_t * test, TObjArray ** list) //Float_t kThreshold = 80. ; Int_t nTowersPerSM = 24*48; // number of towers in a SuperModule; 24x48 - Double_t nTot = fknSM * nTowersPerSM ; + Double_t nTot = fgknSM * nTowersPerSM ; TList *lstF = 0; for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { test[specie] = 0.0 ; @@ -221,7 +221,7 @@ void AliEMCALQAChecker::CheckRaws(Double_t * test, TObjArray ** list) lstF->Add(fLineRow[iLine]->Clone()); } //Now adding the text to for each SM - for(Int_t iSM = 0 ; iSM < fknSM ; iSM++){ //number of SMs loop start + for(Int_t iSM = 0 ; iSM < fgknSM ; iSM++){ //number of SMs loop start lstF->Add(fTextSM[iSM]->Clone()); } // diff --git a/EMCAL/AliEMCALQAChecker.h b/EMCAL/AliEMCALQAChecker.h index 8b29f1c86d0..cf2a657b468 100644 --- a/EMCAL/AliEMCALQAChecker.h +++ b/EMCAL/AliEMCALQAChecker.h @@ -65,28 +65,28 @@ public: protected: - virtual void Check( Double_t * test, AliQAv1::ALITASK_t index, TObjArray ** list, const AliDetectorRecoParam * /*recoParam*/) ; - //virtual void SetQA(AliQAv1::ALITASK_t index, Double_t * value) const ; + virtual void Check( Double_t * test, AliQAv1::ALITASK_t index, TObjArray ** list, const AliDetectorRecoParam * /*recoParam*/) ; + //virtual void SetQA(AliQAv1::ALITASK_t index, Double_t * value) const ; void CheckRaws(Double_t* test, TObjArray ** list); - void CheckRecPoints(Double_t* /*test*/, TObjArray** /*list*/){;} - void CheckESD(Double_t* /*test*/, TObjArray** /*list*/){;} - TH1* GetHisto(TObjArray* list, const char* hname, Int_t specie) const; - Double_t MarkHisto(TH1& histo, Double_t value) const; + void CheckRecPoints(Double_t* /*test*/, TObjArray** /*list*/) const {;} + void CheckESD(Double_t* /*test*/, TObjArray** /*list*/) const {;} + TH1* GetHisto(TObjArray* list, const char* hname, Int_t specie) const; + Double_t MarkHisto(TH1& histo, Double_t value) const; private: //TH1F * htemp; //a tempory histrogram for getting the mean and sigma //Double_t fMean; //mean value //Double_t fWidth; //sigma of the distribution - static const Int_t fknSM = 10; //! number of current SM + static const Int_t fgknSM = 10; //! number of current SM // TLine ** fLine ; //! line to distinguish the different SM // TLine ** fHref ; //! Line marking the average value for each SM TText ** fTextSM ; //! Text info for each SM TLine * fLineCol ; //! line to distinguish the different SM side: A side and C side TLine * fLineRow[4] ; //! line to distinguish the different SM sectors (0-4) TPaveText * fText ; //! Information text for the quality of each SM - ClassDef(AliEMCALQAChecker,3) // description + ClassDef(AliEMCALQAChecker,4) // description }; diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx index 4a37001c213..5f31f00a5c5 100644 --- a/EMCAL/AliEMCALQADataMakerRec.cxx +++ b/EMCAL/AliEMCALQADataMakerRec.cxx @@ -1120,150 +1120,137 @@ void AliEMCALQADataMakerRec::GetTruChannelPosition( Int_t &globRow, Int_t &globC // output global row/collumn position (0,0 = SMA0, phi = 0, |eta| = max) globRow = mrow + drow + trow; globColumn = mcol + tcol; - return; + return; } //____________________________________________________________________________ -void AliEMCALQADataMakerRec::MakeRawsSTU(AliRawReader* rawReader){ - - AliEMCALTriggerSTURawStream* inSTU = new AliEMCALTriggerSTURawStream(rawReader); - - rawReader->Reset(); - rawReader->Select("EMCAL", 44); - +void AliEMCALQADataMakerRec::MakeRawsSTU(AliRawReader* rawReader) +{ // STU specifics + AliEMCALTriggerSTURawStream* inSTU = new AliEMCALTriggerSTURawStream(rawReader); - //L1 segmentation - Int_t sizeL1gsubr = 1; - Int_t sizeL1gpatch = 2; - Int_t sizeL1jsubr = 4; + rawReader->Reset(); + rawReader->Select("EMCAL", 44); - Int_t EMCALtrig[AliEMCALGeoParams::fgkEMCALSTUCols][AliEMCALGeoParams::fgkEMCALSTURows]; + //L1 segmentation + Int_t sizeL1gsubr = 1; + Int_t sizeL1gpatch = 2; + Int_t sizeL1jsubr = 4; - memset(EMCALtrig, 0, sizeof(int) * AliEMCALGeoParams::fgkEMCALSTUCols * AliEMCALGeoParams::fgkEMCALSTURows); - - - + Int_t iEMCALtrig[AliEMCALGeoParams::fgkEMCALSTUCols][AliEMCALGeoParams::fgkEMCALSTURows]; + memset(iEMCALtrig, 0, sizeof(int) * AliEMCALGeoParams::fgkEMCALSTUCols * AliEMCALGeoParams::fgkEMCALSTURows); - if (inSTU->ReadPayLoad()) - { - - //Fw version (use in case of change in L1 jet - Int_t fw = inSTU->GetFwVersion(); - Int_t sizeL1jpatch = 2+(fw >> 16); - - //To check link - - Int_t mask = inSTU->GetFrameReceived(); + if (inSTU->ReadPayLoad()) + { + //Fw version (use in case of change in L1 jet + Int_t fw = inSTU->GetFwVersion(); + Int_t sizeL1jpatch = 2+(fw >> 16); + //To check link + Int_t mask = inSTU->GetFrameReceived(); - for (int i = 0; i < 32; i++) - { - if ((mask >> i) & 0x1) FillRawsData(kSTUTRU, i); - } - + for (int i = 0; i < 32; i++) + { + if ((mask >> i) & 0x1) FillRawsData(kSTUTRU, i); + } - //V0 signal in STU - Int_t V0Sig = inSTU->GetV0A()+inSTU->GetV0C(); - - //FastOR amplitude receive from TRU - for (Int_t i = 0; i < 32; i++) - { - UInt_t adc[96]; - for (Int_t j = 0; j < 96; j++) adc[j] = 0; - - inSTU->GetADC(i, adc); - - Int_t iTRU = fGeom->GetTRUIndexFromSTUIndex(i); + //V0 signal in STU + Int_t iV0Sig = inSTU->GetV0A()+inSTU->GetV0C(); + + //FastOR amplitude receive from TRU + for (Int_t i = 0; i < 32; i++) + { + UInt_t adc[96]; + for (Int_t j = 0; j < 96; j++) adc[j] = 0; + + inSTU->GetADC(i, adc); + + Int_t iTRU = fGeom->GetTRUIndexFromSTUIndex(i); - for (Int_t j = 0; j < 96; j++) - { - Int_t idx; - fGeom->GetAbsFastORIndexFromTRU(iTRU, j, idx); + for (Int_t j = 0; j < 96; j++) + { + Int_t idx; + fGeom->GetAbsFastORIndexFromTRU(iTRU, j, idx); - Int_t px, py; - fGeom->GetPositionInEMCALFromAbsFastORIndex(idx, px, py); + Int_t px, py; + fGeom->GetPositionInEMCALFromAbsFastORIndex(idx, px, py); - EMCALtrig[px][py] = adc[j]; - } + iEMCALtrig[px][py] = adc[j]; } + } - //L1 Gamma patches - Int_t iTRU_STU, x, y; - for (Int_t i = 0; i < inSTU->GetNL1GammaPatch(); i++) + //L1 Gamma patches + Int_t iTRUSTU, x, y; + for (Int_t i = 0; i < inSTU->GetNL1GammaPatch(); i++) + { + if (inSTU->GetL1GammaPatch(i, iTRUSTU, x, y)) // col (0..23), row (0..3) { - if (inSTU->GetL1GammaPatch(i, iTRU_STU, x, y)) // col (0..23), row (0..3) - { - Int_t iTRU; - iTRU = fGeom->GetTRUIndexFromSTUIndex(iTRU_STU); - - Int_t etaG = 23-x, phiG = y + 4 * int(iTRU/2); //position in EMCal + Int_t iTRU; + iTRU = fGeom->GetTRUIndexFromSTUIndex(iTRUSTU); + + Int_t etaG = 23-x, phiG = y + 4 * int(iTRU/2); //position in EMCal + if (iTRU%2) etaG += 24; //C-side - if (iTRU%2) etaG += 24; //C-side - - etaG = etaG - sizeL1gsubr * sizeL1gpatch + 1; + etaG = etaG - sizeL1gsubr * sizeL1gpatch + 1; - //Position of patch L1G (bottom-left FastOR of the patch) - FillRawsData(kGL1, etaG, phiG); + //Position of patch L1G (bottom-left FastOR of the patch) + FillRawsData(kGL1, etaG, phiG); - //loop to sum amplitude of FOR in the gamma patch - Int_t L1G_PatchAmp = 0; - for (Int_t L1Gx = 0; L1Gx < sizeL1gpatch; L1Gx ++) + //loop to sum amplitude of FOR in the gamma patch + Int_t L1GPatchAmp = 0; + for (Int_t L1Gx = 0; L1Gx < sizeL1gpatch; L1Gx ++) + { + for (Int_t L1Gy = 0; L1Gy < sizeL1gpatch; L1Gy ++) { - for (Int_t L1Gy = 0; L1Gy < sizeL1gpatch; L1Gy ++) - { - if (etaG+L1Gx < 48 && phiG+L1Gy < 64) L1G_PatchAmp += EMCALtrig[etaG+L1Gx][phiG+L1Gy]; - //cout << EMCALtrig[etaG+L1Gx][phiG+L1Gy] << endl; - } + if (etaG+L1Gx < 48 && phiG+L1Gy < 64) L1GPatchAmp += iEMCALtrig[etaG+L1Gx][phiG+L1Gy]; + //cout << iEMCALtrig[etaG+L1Gx][phiG+L1Gy] << endl; } - - //if (L1G_PatchAmp > 500) cout << "L1G amp =" << L1G_PatchAmp << endl; - FillRawsData(kGL1V0, V0Sig, L1G_PatchAmp); - } + + //if (L1GPatchAmp > 500) cout << "L1G amp =" << L1GPatchAmp << endl; + FillRawsData(kGL1V0, iV0Sig, L1GPatchAmp); + } + } - - //L1 Jet patches - for (Int_t i = 0; i < inSTU->GetNL1JetPatch(); i++) + //L1 Jet patches + for (Int_t i = 0; i < inSTU->GetNL1JetPatch(); i++) + { + if (inSTU->GetL1JetPatch(i, x, y)) // col (0,15), row (0,11) { - if (inSTU->GetL1JetPatch(i, x, y)) // col (0,15), row (0,11) - { - - Int_t etaJ = sizeL1jsubr * (11-y-sizeL1jpatch + 1); - Int_t phiJ = sizeL1jsubr * (15-x-sizeL1jpatch + 1); + + Int_t etaJ = sizeL1jsubr * (11-y-sizeL1jpatch + 1); + Int_t phiJ = sizeL1jsubr * (15-x-sizeL1jpatch + 1); + + //position of patch L1J (FOR bottom-left) + FillRawsData(kJL1, etaJ, phiJ); - //position of patch L1J (FOR bottom-left) - FillRawsData(kJL1, etaJ, phiJ); - - //loop the sum aplitude of FOR in the jet patch - Int_t L1J_PatchAmp = 0; - for (Int_t L1Jx = 0; L1Jx < sizeL1jpatch*4; L1Jx ++) + //loop the sum aplitude of FOR in the jet patch + Int_t L1JPatchAmp = 0; + for (Int_t L1Jx = 0; L1Jx < sizeL1jpatch*4; L1Jx ++) + { + for (Int_t L1Jy = 0; L1Jy < sizeL1jpatch*4; L1Jy ++) { - for (Int_t L1Jy = 0; L1Jy < sizeL1jpatch*4; L1Jy ++) - { - if (etaJ+L1Jx < 48 && phiJ+L1Jy < 64) L1J_PatchAmp += EMCALtrig[etaJ+L1Jx][phiJ+L1Jy]; - } + if (etaJ+L1Jx < 48 && phiJ+L1Jy < 64) L1JPatchAmp += iEMCALtrig[etaJ+L1Jx][phiJ+L1Jy]; } - - //cout << "L1J amp =" << L1J_PatchAmp << endl; - FillRawsData(kJL1V0, V0Sig, L1J_PatchAmp); - } + + //cout << "L1J amp =" << L1JPatchAmp << endl; + FillRawsData(kJL1V0, iV0Sig, L1JPatchAmp); } - } + } - //Fill FOR amplitude histo - for (Int_t i = 0; i < 48; i++) + //Fill FOR amplitude histo + for (Int_t i = 0; i < 48; i++) + { + for (Int_t j = 0; j < 60; j++) { - for (Int_t j = 0; j < 60; j++) - { - if (EMCALtrig[i][j] != 0) FillRawsData(kAmpL1, i, j, EMCALtrig[i][j]); - } + if (iEMCALtrig[i][j] != 0) FillRawsData(kAmpL1, i, j, iEMCALtrig[i][j]); } - - delete inSTU; - return; + } + + delete inSTU; + return; } diff --git a/EMCAL/AliEMCALQADataMakerRec.h b/EMCAL/AliEMCALQADataMakerRec.h index 009b86881f1..80a5aa7f682 100644 --- a/EMCAL/AliEMCALQADataMakerRec.h +++ b/EMCAL/AliEMCALQADataMakerRec.h @@ -1,5 +1,5 @@ -#ifndef ALIEMCALQADataMakerRec_H -#define ALIEMCALQADataMakerRec_H +#ifndef ALIEMCALQADATAMAKERREC_H +#define ALIEMCALQADATAMAKERREC_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -135,7 +135,7 @@ public: virtual void MakeDigits(TTree * digTree) ; virtual void MakeRecPoints(TTree * recpoTree) ; virtual void MakeRaws(AliRawReader* rawReader) ; - void MakeRawsSTU(AliRawReader* rawReader); + virtual void MakeRawsSTU(AliRawReader* rawReader); virtual void StartOfDetectorCycle() ; private: @@ -175,4 +175,4 @@ private: }; -#endif // AliEMCALQADataMakerRec_H +#endif // AliEMCALQADATAMAKERREC_H diff --git a/EMCAL/AliEMCALSensorTemp.cxx b/EMCAL/AliEMCALSensorTemp.cxx index 8487d96d081..07bfa7799b4 100644 --- a/EMCAL/AliEMCALSensorTemp.cxx +++ b/EMCAL/AliEMCALSensorTemp.cxx @@ -89,7 +89,8 @@ TClonesArray * AliEMCALSensorTemp::ReadList(const char *fname, //______________________________________________________________________________________________ TClonesArray * AliEMCALSensorTemp::ReadTree(TTree *tree, - const TString& amandaString) { + const TString& amandaString) +{ // read selected info from TTree Int_t nentries = tree->GetEntries(); Int_t sensor=0; diff --git a/EMCAL/AliEMCALSensorTempArray.h b/EMCAL/AliEMCALSensorTempArray.h index 22b9585bceb..d8f9e4378ed 100644 --- a/EMCAL/AliEMCALSensorTempArray.h +++ b/EMCAL/AliEMCALSensorTempArray.h @@ -1,5 +1,5 @@ -#ifndef AliEMCALSensorTempArray_H -#define AliEMCALSensorTempArray_H +#ifndef AliEMCALSENSORTEMPARRAY_H +#define AliEMCALSENSORTEMPARRAY_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ diff --git a/EMCAL/EMCALLEDda.cxx b/EMCAL/EMCALLEDda.cxx index b147bcaec2d..65bfca6c1cb 100644 --- a/EMCAL/EMCALLEDda.cxx +++ b/EMCAL/EMCALLEDda.cxx @@ -59,7 +59,7 @@ extern "C" { Arguments: list of DATE raw data files */ -int main(int argc, char **argv) { +int main(int argc, char **argv) { // Main routine, EMC signal detector algorithm AliLog::SetClassDebugLevel("AliCaloRawStreamV3",-5); AliLog::SetClassDebugLevel("AliRawReaderDate",-5); diff --git a/EMCAL/EMCALPEDda.cxx b/EMCAL/EMCALPEDda.cxx index 1410b0db1a3..cd443bf8d92 100644 --- a/EMCAL/EMCALPEDda.cxx +++ b/EMCAL/EMCALPEDda.cxx @@ -64,7 +64,7 @@ extern "C" { Arguments: list of DATE raw data files */ -int main(int argc, char **argv) { +int main(int argc, char **argv) { // Main routine, EMC pedestal detector algorithm AliLog::SetClassDebugLevel("AliCaloRawStreamV3",-5); AliLog::SetClassDebugLevel("AliRawReaderDate",-5); -- 2.43.0