From 2d512377bd7d473591b4222fc2530035416179c3 Mon Sep 17 00:00:00 2001 From: dsilverm Date: Thu, 6 Mar 2014 16:40:31 -0500 Subject: [PATCH] correcting number of supermodules for DCal --- EMCAL/AliEMCALGeoParams.h | 4 ++-- EMCAL/AliEMCALQAChecker.h | 2 +- EMCAL/AliEMCALQADataMakerRec.cxx | 6 +++--- EMCAL/AliEMCALRawUtils.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EMCAL/AliEMCALGeoParams.h b/EMCAL/AliEMCALGeoParams.h index 29cf5362e06..4b40b001d59 100644 --- a/EMCAL/AliEMCALGeoParams.h +++ b/EMCAL/AliEMCALGeoParams.h @@ -15,7 +15,7 @@ class AliEMCALGeoParams public: // general geometry info - static const int fgkEMCALModules = 22; // number of modules, adapted for DCAL + static const int fgkEMCALModules = 20; // number of modules, 12 for EMCal + 8 for DCAL static const int fgkEMCALRows = 24; // number of rows per module for EMCAL static const int fgkEMCALCols = 48; // number of columns per module for EMCAL @@ -27,7 +27,7 @@ public: { return ( (iSM%2==0) ? iCol/2 : AliEMCALGeoParams::fgkEMCALLEDRefs - 1 - iCol/2 ); } // also a few readout related variables: - static const int fgkLastAltroDDL = 43; // 0..23 (i.e. 24) for EMCAL; 24..43 (i.e. 20) allocated for DCAL + static const int fgkLastAltroDDL = 39; // 0..23 (i.e. 24) for EMCAL; 24..39 (i.e. 16) allocated for DCAL static const int fgkSampleMax = 1023; // highest possible sample value (10-bit = 0x3ff) static const int fgkOverflowCut = 950; // saturation starts around here; also exist as private constant in AliEMCALRawUtils, should probably be replaced static const int fgkSampleMin = 0; // lowest possible sample value diff --git a/EMCAL/AliEMCALQAChecker.h b/EMCAL/AliEMCALQAChecker.h index 7b37e065142..3ce1977d9d6 100644 --- a/EMCAL/AliEMCALQAChecker.h +++ b/EMCAL/AliEMCALQAChecker.h @@ -83,7 +83,7 @@ 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 fgknSM = 12; //! number of current SM + static const Int_t fgknSM = 20; //! number of current SM; EMCal + DCal // 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 diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx index 133df7c44d7..712d098bb64 100644 --- a/EMCAL/AliEMCALQADataMakerRec.cxx +++ b/EMCAL/AliEMCALQADataMakerRec.cxx @@ -85,8 +85,8 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(fitAlgorithm fitAlgo) : fFittingAlgorithm(0), fRawAnalyzer(0), fRawAnalyzerTRU(0), - fGeom(0), - fSuperModules(22), // FIXME!!! number of SuperModules; updated to 22 for DCal + fGeom(0), + fSuperModules(20), // number of SuperModules; updated to 20 for EMCal + DCal fFirstPedestalSample(0), fLastPedestalSample(3), fFirstPedestalSampleTRU(0), @@ -120,7 +120,7 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(fitAlgorithm fitAlgo) : fRawAnalyzerTRU->SetFixTau(kTRUE); fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper - fGeom = new AliEMCALGeometry("EMCAL_COMPLETE12SMV1_DCAL", "EMCAL"); + fGeom = new AliEMCALGeometry("EMCAL_COMPLETE12SMV1_DCAL_8SM", "EMCAL"); // for (Int_t sm = 0 ; sm < fSuperModules ; sm++){ // fTextSM[sm] = NULL ; // } diff --git a/EMCAL/AliEMCALRawUtils.cxx b/EMCAL/AliEMCALRawUtils.cxx index 2fe30ac9a72..3b70379d44d 100644 --- a/EMCAL/AliEMCALRawUtils.cxx +++ b/EMCAL/AliEMCALRawUtils.cxx @@ -128,7 +128,7 @@ void AliEMCALRawUtils::Digits2Raw() return; } - static const Int_t nDDL = 22*2; // 22 SM for DCal hardcoded for now. Buffers allocated dynamically, when needed, so just need an upper limit here + static const Int_t nDDL = 20*2; // 20 SM for EMCal + DCal hardcoded for now. Buffers allocated dynamically, when needed, so just need an upper limit here AliAltroBuffer* buffers[nDDL]; for (Int_t i=0; i < nDDL; i++) buffers[i] = 0; @@ -284,7 +284,7 @@ void AliEMCALRawUtils::Raw2Digits(AliRawReader* reader,TClonesArray *digitsArr, if (!reader) {Error("Raw2Digits", "no raw reader found !");return;} AliEMCALTriggerSTURawStream inSTU(reader); AliCaloRawStreamV3 in(reader,"EMCAL",fMapping); - reader->Select("EMCAL",0,43); // 43 = AliEMCALGeoParams::fgkLastAltroDDL + reader->Select("EMCAL",0,39); // 39 = AliEMCALGeoParams::fgkLastAltroDDL fTriggerRawDigitMaker->Reset(); fTriggerRawDigitMaker->SetIO(reader, in, inSTU, digitsTRG, trgData); fRawAnalyzer->SetIsZeroSuppressed(true); // TMP - should use stream->IsZeroSuppressed(), or altro cfg registers later -- 2.43.0