From 9b1e069f5674d9167ba9e4a84bcbeeead92e2549 Mon Sep 17 00:00:00 2001 From: ivana Date: Wed, 11 Feb 2009 10:32:44 +0000 Subject: [PATCH] Changes in trigger: - Modify naming convention of HV and Currents of trigger RPCs according to the updated variable names in DCS. - Changed default values in Calib/TriggerDCS - Coding conventions corrections (Diego) --- MUON/AliMUONCDB.cxx | 6 +++--- MUON/AliMUONTrackHitPattern.cxx | 26 +++++++++++++------------- MUON/AliMUONTrackHitPattern.h | 16 ++++++++-------- MUON/TestMUONPreprocessor.C | 9 +++++---- MUON/mapping/AliMpDCSNamer.cxx | 8 ++++---- MUON/mapping/AliMpDCSNamer.h | 2 +- 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/MUON/AliMUONCDB.cxx b/MUON/AliMUONCDB.cxx index a0687419712..08cfc18df97 100644 --- a/MUON/AliMUONCDB.cxx +++ b/MUON/AliMUONCDB.cxx @@ -405,14 +405,14 @@ AliMUONCDB::MakeTriggerDCSStore(TMap& aliasMap, Bool_t defaultValues) for ( UInt_t timeStamp = 0; timeStamp < 60*15; timeStamp += 120 ) { Float_t value = - (measureType == AliMpDCSNamer::kDCSI) ? 0.4 : 8000.; + (measureType == AliMpDCSNamer::kDCSI) ? 2. : 8000.; if (!defaultValues) { switch (measureType){ case AliMpDCSNamer::kDCSI: - value = GetRandom(0.4,0.02,true); + value = GetRandom(2.,0.4,true); break; case AliMpDCSNamer::kDCSHV: - value = GetRandom(8000.,100.,true); + value = GetRandom(8000.,16.,true); break; } } diff --git a/MUON/AliMUONTrackHitPattern.cxx b/MUON/AliMUONTrackHitPattern.cxx index 26f50133aae..6ce3d0c3c1a 100644 --- a/MUON/AliMUONTrackHitPattern.cxx +++ b/MUON/AliMUONTrackHitPattern.cxx @@ -88,9 +88,9 @@ AliMUONTrackHitPattern::AliMUONTrackHitPattern(const AliMUONRecoParam* recoParam const AliMUONGeometryTransformer& transformer, const AliMUONDigitMaker& digitMaker) : TObject(), -fRecoParam(recoParam), -fTransformer(transformer), -fDigitMaker(digitMaker), +fkRecoParam(recoParam), +fkTransformer(transformer), +fkDigitMaker(digitMaker), fDeltaZ(0.0), fTrigCovariance(0x0), fkMaxDistance(99999.) @@ -144,7 +144,7 @@ void AliMUONTrackHitPattern::CheckConstants() const //______________________________________________________________________________ -void AliMUONTrackHitPattern::ExecuteValidation(AliMUONVTrackStore& trackStore, +void AliMUONTrackHitPattern::ExecuteValidation(const AliMUONVTrackStore& trackStore, const AliMUONVTriggerTrackStore& triggerTrackStore, const AliMUONVTriggerStore& triggerStore) const { @@ -431,7 +431,7 @@ AliMUONTrackHitPattern::TriggerDigits(const AliMUONVTriggerStore& triggerStore, // } Int_t nBoard = locTrg->LoCircuit(); - fDigitMaker.TriggerDigits(nBoard, xyPattern, digitStore); + fkDigitMaker.TriggerDigits(nBoard, xyPattern, digitStore); } return kTRUE; } @@ -439,7 +439,7 @@ AliMUONTrackHitPattern::TriggerDigits(const AliMUONVTriggerStore& triggerStore, //______________________________________________________________________________ void -AliMUONTrackHitPattern::FindPadMatchingTrack(AliMUONVDigitStore& digitStore, +AliMUONTrackHitPattern::FindPadMatchingTrack(const AliMUONVDigitStore& digitStore, const AliMUONTrackParam& trackParam, Bool_t isMatch[2], Int_t iChamber) const { @@ -475,7 +475,7 @@ AliMUONTrackHitPattern::FindPadMatchingTrack(AliMUONVDigitStore& digitStore, Float_t ylocal1 = pad.Position().Y(); Float_t dpx = pad.Dimensions().X(); Float_t dpy = pad.Dimensions().Y(); - fTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad); + fkTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad); Float_t matchDist = MinDistanceFromPad(xpad, ypad, zpad, dpx, dpy, trackParam); if(matchDist>minMatchDist[cathode])continue; isMatch[cathode] = kTRUE; @@ -522,7 +522,7 @@ AliMUONTrackHitPattern::MinDistanceFromPad(Float_t xPad, Float_t yPad, Float_t z //_____________________________________________________________________________ -Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(AliMUONVDigitStore& digitStore, Int_t &detElemId, +Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(const AliMUONVDigitStore& digitStore, Int_t &detElemId, Float_t coor[2], Bool_t isMatch[2], TArrayI nboard[2], TArrayF &zRealMatch, Float_t y11) const { @@ -575,7 +575,7 @@ Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(AliMUONVDigitStore& digitStore Float_t ylocal1 = pad.Position().Y(); Float_t dpx = pad.Dimensions().X(); Float_t dpy = pad.Dimensions().Y(); - fTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad); + fkTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad); AliDebug(2, Form("\nDetElemId = %i Cathode = %i Pad = (%i,%i) = (%.2f,%.2f) Dim = (%.2f,%.2f) Track = (%.2f,%.2f)\n",currDetElemId,cathode,ix,iy,xpad,ypad,dpx,dpy,coor[0],coor[1])); // searching track intersection with chambers (second approximation) if(ch%2==1){ @@ -673,8 +673,8 @@ Int_t AliMUONTrackHitPattern::DetElemIdFromPos(Float_t x, Float_t y, Float_t xlocal2 = +deltax; Float_t ylocal2 = +deltay; Float_t xg01, yg01, zg1, xg02, yg02, zg2; - fTransformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg01, yg01, zg1); - fTransformer.Local2Global(detElemId, xlocal2, ylocal2, 0, xg02, yg02, zg2); + fkTransformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg01, yg01, zg1); + fkTransformer.Local2Global(detElemId, xlocal2, ylocal2, 0, xg02, yg02, zg2); Float_t xg1 = xg01, xg2 = xg02, yg1 = yg01, yg2 = yg02; @@ -717,7 +717,7 @@ void AliMUONTrackHitPattern::LocalBoardFromPos(Float_t x, Float_t y, localBoard[loc]=-1; } Float_t xl, yl, zl; - fTransformer.Global2Local(detElemId, x, y, 0, xl, yl, zl); + fkTransformer.Global2Local(detElemId, x, y, 0, xl, yl, zl); TVector2 pos(xl,yl); const AliMpVSegmentation* seg = AliMpSegmentation::Instance() @@ -734,7 +734,7 @@ void AliMUONTrackHitPattern::LocalBoardFromPos(Float_t x, Float_t y, //_____________________________________________________________________________ Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern, - AliMUONTriggerTrack *matchedTrigTrack, + const AliMUONTriggerTrack* matchedTrigTrack, AliMUONVDigitStore& digitStore) const { // diff --git a/MUON/AliMUONTrackHitPattern.h b/MUON/AliMUONTrackHitPattern.h index e946edc97c2..9dbede21d3b 100644 --- a/MUON/AliMUONTrackHitPattern.h +++ b/MUON/AliMUONTrackHitPattern.h @@ -36,7 +36,7 @@ public: const AliMUONDigitMaker& digitMaker); virtual ~AliMUONTrackHitPattern(); // Destructor - void ExecuteValidation(AliMUONVTrackStore& trackStore, + void ExecuteValidation(const AliMUONVTrackStore& trackStore, const AliMUONVTriggerTrackStore& triggerTrackStore, const AliMUONVTriggerStore& triggerStore) const; @@ -63,7 +63,7 @@ protected: // Methods for hit pattern from tracker track - void FindPadMatchingTrack(AliMUONVDigitStore& digitStore, + void FindPadMatchingTrack(const AliMUONVDigitStore& digitStore, const AliMUONTrackParam& trackParam, Bool_t isMatch[2], Int_t iChamber) const; @@ -73,10 +73,10 @@ protected: // Methods for hit pattern from matched trigger track Bool_t PerformTrigTrackMatch(UShort_t &pattern, - AliMUONTriggerTrack *matchedTrigTrack, + const AliMUONTriggerTrack* matchedTrigTrack, AliMUONVDigitStore& digitStore) const; - Int_t FindPadMatchingTrig(AliMUONVDigitStore& digitStore, Int_t &detElemId, Float_t coor[2], + Int_t FindPadMatchingTrig(const AliMUONVDigitStore& digitStore, Int_t &detElemId, Float_t coor[2], Bool_t isMatch[2], TArrayI nboard[2], TArrayF &zRealMatch, Float_t y11) const; @@ -88,7 +88,7 @@ protected: void LocalBoardFromPos(Float_t x, Float_t y, Int_t detElemId, Int_t cathode, Int_t localBoard[4]) const; - const AliMUONRecoParam* GetRecoParam() const { return fRecoParam; } + const AliMUONRecoParam* GetRecoParam() const { return fkRecoParam; } private: /// Not implemented @@ -98,9 +98,9 @@ private: void CheckConstants() const; - const AliMUONRecoParam* fRecoParam; //!< pointer to reco parameters - const AliMUONGeometryTransformer& fTransformer; //!< geometry transformer - const AliMUONDigitMaker& fDigitMaker; //!< pointer to digit maker + const AliMUONRecoParam* fkRecoParam; //!< pointer to reco parameters + const AliMUONGeometryTransformer& fkTransformer; //!< geometry transformer + const AliMUONDigitMaker& fkDigitMaker; //!< pointer to digit maker Double_t fDeltaZ; //!< distance between stations diff --git a/MUON/TestMUONPreprocessor.C b/MUON/TestMUONPreprocessor.C index ed2c3fb1662..bfecc5a20ab 100644 --- a/MUON/TestMUONPreprocessor.C +++ b/MUON/TestMUONPreprocessor.C @@ -281,18 +281,19 @@ TMap* CreateDCSAliasMap(const char* inputCDB, Int_t runNumber) value = random.Gaus(1750,62.5); if ( aliasName == "MchHvLvLeft/Chamber00Left/Quad2Sect1.actual.vMon") value = 500; } - else if(aliasName.Contains("imon")){ - value = random.Gaus(0.4,0.02); + else if(aliasName.Contains("iMon")){ + value = random.Gaus(2.,0.4); } else { - value = random.Gaus(8000,100); + value = random.Gaus(8000.,16.); } AliDCSValue* dcsValue = new AliDCSValue(value,timeStamp); valueSet->Add(dcsValue); } if ( aliasName == "MchHvLvLeft/Chamber04Left/Slat06.actual.vMon" ) continue; - if ( aliasName == "MTR_INSIDE_MT22_RPC3_HV.vmon" ) continue; + if ( aliasName == "MTR_INSIDE_MT22_RPC3_HV.vEff" ) continue; + if ( aliasName == "MTR_OUTSIDE_MT21_RPC4_HV.actual.iMon" ) continue; aliasMap->Add(new TObjString(*alias),valueSet); } } // loop on aliases diff --git a/MUON/mapping/AliMpDCSNamer.cxx b/MUON/mapping/AliMpDCSNamer.cxx index c8c00d14394..229248ec54c 100644 --- a/MUON/mapping/AliMpDCSNamer.cxx +++ b/MUON/mapping/AliMpDCSNamer.cxx @@ -65,9 +65,9 @@ const char* AliMpDCSNamer::fgkDCSSideTrackerName[] = { "Left", "Right" }; const char* AliMpDCSNamer::fgkDCSSwitchSt345Pattern = "MchDE%04dsw%d.inValue"; -const char* AliMpDCSNamer::fgkDCSChannelTriggerPattern[] = {"MTR_%3sSIDE_MT%2i_RPC%i_HV.%4s", "MTR_%2sSIDE_MT%2i_RPC%i_HV.%4s"}; +const char* AliMpDCSNamer::fgkDCSChannelTriggerPattern[] = {"MTR_%3sSIDE_MT%2i_RPC%i_HV.%s", "MTR_%2sSIDE_MT%2i_RPC%i_HV.%s"}; const char* AliMpDCSNamer::fgkDCSSideTriggerName[] = { "OUT", "IN" }; -const char* AliMpDCSNamer::fgkDCSMeasureName[] = { "imon", "vmon" }; +const char* AliMpDCSNamer::fgkDCSMeasureName[] = { "actual.iMon", "vEff" }; const char* AliMpDCSNamer::fgkDetectorName[] = { "TRACKER", "TRIGGER" }; @@ -476,7 +476,7 @@ AliMpDCSNamer::DetElemIdFromDCSAlias(const char* dcsAlias) const /// /// MchHvLv[Left|Right]/Chamber##[Left|Right]/Chamber##[Left|Right]Quad#Sect#.actual.vMon /// - /// MTR_Side[OUTSIDE|INSIDE]_MTChamber##_RPC#_HV_Type[imon|vmon] + /// MTR_Side[OUTSIDE|INSIDE]_MTChamber##_RPC#_HV.Type[actual.iMon|vEff] AliDebug(1,Form("dcsAlias=%s",dcsAlias)); @@ -497,7 +497,7 @@ AliMpDCSNamer::DetElemIdFromDCSAlias(const char* dcsAlias) const int n1(-1); int n3(-1); int n4(-1); - char type[10]; + char type[15]; char cside[4]; int detElemId(-1); diff --git a/MUON/mapping/AliMpDCSNamer.h b/MUON/mapping/AliMpDCSNamer.h index fa6545d2db3..e9b203c5e68 100644 --- a/MUON/mapping/AliMpDCSNamer.h +++ b/MUON/mapping/AliMpDCSNamer.h @@ -28,7 +28,7 @@ public: Bool_t SetDetector(const char* detName); - const char* DCSChannelName(Int_t detElemId, Int_t sector=0, Int_t DCSvariable=0) const; + const char* DCSChannelName(Int_t detElemId, Int_t sector=0, Int_t dcsMeasure=0) const; const char* DCSSwitchName(Int_t detElemId, Int_t pcbNumber) const; -- 2.43.0