* provided "as is" without express or implied warranty. *
**************************************************************************/
-// $Id$
+// $Id: AliMUONCalibrationData.cxx 59486 2012-11-07 22:06:24Z laphecet $
#include "AliMUONCalibrationData.h"
#include "AliCDBEntry.h"
#include "AliCDBManager.h"
#include "AliCodeTimer.h"
+#include "AliDCSValue.h"
#include "AliLog.h"
+#include "AliMpDCSNamer.h"
+#include "AliMpIntPair.h"
+#include "AliMUONGlobalCrateConfig.h"
+#include "AliMUONRegionalTriggerConfig.h"
#include "AliMUONRejectList.h"
#include "AliMUONTriggerEfficiencyCells.h"
#include "AliMUONTriggerLut.h"
+#include "AliMUONVCalibParam.h"
#include "AliMUONVStore.h"
#include "AliMUONVStore.h"
-#include "AliMUONVCalibParam.h"
-#include "AliMUONGlobalCrateConfig.h"
-#include "AliMUONRegionalTriggerConfig.h"
#include <Riostream.h>
#include <TClass.h>
#include <TMap.h>
+#include <TMath.h>
//-----------------------------------------------------------------------------
/// \class AliMUONCalibrationData
/// \author Laurent Aphecetche
//-----------------------------------------------------------------------------
+using std::cout;
+using std::endl;
/// \cond CLASSIMP
ClassImp(AliMUONCalibrationData)
/// \endcond
-AliMUONVStore* AliMUONCalibrationData::fBypassPedestals(0x0);
-AliMUONVStore* AliMUONCalibrationData::fBypassGains(0x0);
+AliMUONVStore* AliMUONCalibrationData::fgBypassPedestals(0x0);
+AliMUONVStore* AliMUONCalibrationData::fgBypassGains(0x0);
+
+UInt_t AliMUONCalibrationData::fgkDCSSt1Flag(42);
+
+namespace
+{
+ void MarkForDeletion(Int_t* indices, Int_t first, Int_t last)
+ {
+ for ( Int_t i = first; i <= last; ++i )
+ {
+ indices[i] = 1;
+ }
+ }
+}
//_____________________________________________________________________________
AliMUONCalibrationData::AliMUONCalibrationData(Int_t runNumber,
}
+//______________________________________________________________________________
+Bool_t AliMUONCalibrationData::CheckHVGroup(TObjArray& values, Int_t first, Int_t last, Double_t& value, Int_t& slope, TString* msg)
+{
+ // Get the HV of the values between first and last indices
+ // return the HV slope (in Volt per second) and a message
+ // Return kFALSE if we must discard the group
+ //
+
+ if (msg) *msg="";
+
+ if ( last < first ) return kFALSE;
+ if ( last - first < 2 ) return kFALSE;
+
+ Double_t a(0.0);
+ Double_t b(0.0);
+
+ Float_t HVSAME(1); // 1 volts
+
+ AliDCSValue* vfirst = static_cast<AliDCSValue*>(values.UncheckedAt(first));
+ AliDCSValue* vlast = static_cast<AliDCSValue*>(values.UncheckedAt(last));
+
+ Int_t deltaHV = TMath::Nint(TMath::Abs(vfirst->GetFloat()-vlast->GetFloat()));
+
+ if ( deltaHV < HVSAME ) return kFALSE;
+
+ for ( Int_t i = first; i <= last; ++i )
+ {
+ AliDCSValue* v = static_cast<AliDCSValue*>(values.UncheckedAt(i));
+
+ Double_t y = v->GetFloat() - vfirst->GetFloat();
+ Double_t x = v->GetTimeStamp() - vfirst->GetTimeStamp();
+
+ a += x*y;
+ b += x*x;
+ }
+
+ value = a/b;
+ slope = value > 0 ? 1 : -1;
+ value = TMath::Abs(value);
+
+ UInt_t deltaTime = vlast->GetTimeStamp() - vfirst->GetTimeStamp();
+
+ if (msg)
+ {
+ if (slope>0) (*msg) = Form("RU%d[%d:%d](%d)",TMath::Nint(value),first,last,deltaTime);
+ if (slope<0) (*msg) = Form("RD%d[%d:%d](%d)",TMath::Nint(value),first,last,deltaTime);
+
+ if ( TMath::Nint(value) == 0 )
+ {
+ // this is to protect for the few cases
+ // (see e.g. MchHvLvLeft/Chamber00Left/Quad2Sect0.actual.vMon in run 134497)
+ // where we can have *lots* of values (2483 in this example) but that
+ // are more or less constant...
+ //
+ // or simply to remove small ramps
+ //
+ slope = 0;
+ value = (vfirst->GetFloat()+vlast->GetFloat())/2.0;
+ *msg = Form("FLUCT%d[%d:%d]",TMath::Nint(value),first,last);
+ }
+ }
+
+ return kTRUE;
+}
+
+//______________________________________________________________________________
+Bool_t AliMUONCalibrationData::PatchHVValues(TObjArray& values,
+ TString* msg,
+ Bool_t dryRun)
+{
+ /// We do here a little bit of massaging of the HV values, if needed.
+ ///
+ /// The main point is to "gather" values that are within a given small amount
+ /// of time (typically 60 seconds) and infer a slope from those values
+ /// slope > 0 means it is a ramp-up, slope < 0 that's a ramp-down
+ ///
+ /// This is to avoid both the "ramp-down-before-end-of-run" and the
+ /// "ramp-up-after-start-of-run" syndroms...
+ ///
+ /// Use dryRun = kTRUE to fill the messages *without* altering the values
+ ///
+ /// Return kFALSE is the kind of HV (trouble) case we have here
+ /// has not been identified...
+ ///
+
+ UInt_t DELTATIME(60); // in seconds
+ Int_t IENDRU(60); // in seconds
+
+ // Start by finding groups of values which are not separated (each) by more than
+ // deltaTime
+
+ Bool_t gather(kFALSE);
+ Int_t ifirst(0);
+ Int_t ilast(0);
+ TObjArray groups;
+ groups.SetOwner(kTRUE);
+
+ for ( Int_t i = values.GetLast(); i > 0; --i )
+ {
+ AliDCSValue* vi = static_cast<AliDCSValue*>(values.UncheckedAt(i));
+ AliDCSValue* vj = static_cast<AliDCSValue*>(values.UncheckedAt(i-1));
+
+ if ( vi->GetTimeStamp() - vj->GetTimeStamp() < DELTATIME )
+ {
+ if ( !gather )
+ {
+ gather = kTRUE;
+ ifirst = i;
+ }
+ ilast=i;
+ }
+ else
+ {
+ if ( gather )
+ {
+ ilast=i;
+
+ groups.Add(new AliMpIntPair(ilast,ifirst));
+ }
+ gather = kFALSE;
+ }
+ }
+
+ if (gather)
+ {
+ groups.Add(new AliMpIntPair(0,ifirst));
+ }
+
+ TIter nextGroup(&groups,kIterBackward);
+ AliMpIntPair* p;
+ TString internalMsg;
+ Int_t ngroups(0);
+
+ Int_t nRU(0);
+ Int_t nRD(0);
+ Int_t nStartRU(0);
+ Int_t nEndAndShortRU(0);
+ Int_t nEndRD(0);
+ Int_t nTripRD(0);
+ Int_t nFluct(0);
+ TObjArray trips;
+ trips.SetOwner(kTRUE);
+
+ while ( ( p = static_cast<AliMpIntPair*>(nextGroup()) ) )
+ {
+ Double_t value;
+ Int_t slope;
+
+ TString groupMsg;
+
+ AliDebugClass(1,Form("group %d:%d",p->GetFirst(),p->GetSecond()));
+
+ Bool_t ok = CheckHVGroup(values,p->GetFirst(),p->GetSecond(),value,slope,&groupMsg);
+
+ if (!ok) continue;
+
+ ++ngroups;
+
+ if ( slope > 0 )
+ {
+ if ( p->GetFirst() == 0 )
+ {
+ // start with a ramp-up
+ ++nStartRU;
+ }
+ else if ( p->GetSecond() == values.GetLast() && TMath::Nint(value) < IENDRU )
+ {
+ ++nEndAndShortRU;
+ }
+ else
+ {
+ // ramp-up in the middle of nowhere...
+ ++nRU;
+ }
+ }
+ else if ( slope < 0 )
+ {
+ if ( p->GetSecond() == values.GetLast() )
+ {
+ // end with a ramp-down
+ ++nEndRD;
+ }
+ else
+ {
+ // ramp-down in the middle of nowhere
+ ++nRD;
+ }
+
+ AliDCSValue* d = static_cast<AliDCSValue*>(values.At(p->GetSecond()));
+
+ if ( d->GetFloat() < AliMpDCSNamer::TrackerHVOFF() )
+ {
+ ++nTripRD;
+ AliDCSValue* tripStart = static_cast<AliDCSValue*>(values.At(p->GetFirst()));
+ trips.Add(new AliMpIntPair(tripStart->GetTimeStamp(),TMath::Nint(tripStart->GetFloat())));
+ }
+ }
+ else
+ {
+ ++nFluct;
+ }
+
+ internalMsg += groupMsg;
+ internalMsg += " ";
+ }
+
+ /*
+
+ Once we have "decoded" the groups we try to find out which of
+ the following cases we're facing :
+
+ case A = -------- = OK(1)
+
+ case B = ----
+ \
+ \ = OK, once we have removed the ramp-down (2)
+
+ case C = -----
+ /
+ / = OK, once we have removed the ramp-up (3)
+
+ case D = -----
+ / \
+ / \ = OK, once we have removed the ramp-down (2) and the ramp-up (3)
+
+ case E = ----
+ \
+ \____ = TRIP = BAD (here the ramp-down slope should be bigger than in case C)
+
+ case F = ----
+ \ ----- = BAD (trip + ramp-up at end of run)
+ \____/
+
+ case G = fluctuations (within a range defined in CheckHVGroup...)
+
+ case H =
+ /
+ / = ramp-up right at the end-of-run = OK (4)
+ ------
+
+ (1) OK means the group is identified correctly, still the value can be below ready...
+ (2) ramp-down values will be removed if the ramp is indeed the last values in the serie
+ i.e. it's really an end-of-run problem (otherwise it's not case B)
+ (3) ramp-up values will be removed if the ramp is indeed the first values in the serie
+ i.e. it's really a start-of-run problem (otherwise it's not case C)
+ (4) OK if short enough...
+
+ Any other case is unknown and we'll :
+ a) return kFALSE
+ b) assume the channel is OFF.
+
+
+ */
+
+ AliDebugClass(1,Form("msg=%s ngroupds=%d",internalMsg.Data(),ngroups));
+ AliDebugClass(1,Form("nRU %d nRD %d nStartRU %d nEndRD %d nTripRD %d nFluct %d",
+ nRU,nRD,nStartRU,nEndRD,nTripRD,nFluct));
+
+ TString hvCase("OTHER");
+ int dummy(0),a(-1),b(-1);
+ char r[81];
+ Int_t nvalues = values.GetSize();
+ Int_t* indices = new Int_t[nvalues];
+ memset(indices,0,nvalues*sizeof(Int_t));
+
+ AliDCSValue* vfirst = static_cast<AliDCSValue*>(values.UncheckedAt(0));
+ AliDCSValue* vlast = static_cast<AliDCSValue*>(values.UncheckedAt(values.GetLast()));
+
+ UInt_t meanTimeStamp = ( vfirst->GetTimeStamp() + vlast->GetTimeStamp() ) / 2;
+
+ if ( ngroups == 0 )
+ {
+ hvCase = "A";
+ }
+ else if ( nTripRD > 0 )
+ {
+ const Double_t HVLOWTRIP(600); // a trip below this value is considered a "low trip"
+ // i.e. one starting for a non-operational voltage
+
+ internalMsg += Form("NT:%d ",nTripRD);
+
+ if ( nRU > 0 && nRD > 0 )
+ {
+ hvCase = "F";
+ }
+ else
+ {
+ hvCase = "E";
+ }
+
+ for ( Int_t iTrip = 0; iTrip <= trips.GetLast(); ++iTrip )
+ {
+ AliMpIntPair* tripPair = static_cast<AliMpIntPair*>(trips.At(iTrip));
+ TString tripType("TRIP");
+ if ( tripPair->GetSecond() < HVLOWTRIP)
+ {
+ tripType = "LOWTRIP";
+ }
+
+ internalMsg += Form("%s SV:%d TS:%d ",tripType.Data(),tripPair->GetSecond(),tripPair->GetFirst());
+ }
+
+ // we put here the TRIP value as SV:value
+ // for cases where there's a drop in voltage but the starting point was
+ // below operational voltage, so strictly speaking it's *not* a trip, but
+ // more a big fluctuation
+ if ( !dryRun )
+ {
+ MarkForDeletion(indices,0,values.GetLast());
+ values.Add(new AliDCSValue(static_cast<Float_t>(0),meanTimeStamp));
+ }
+ }
+ else if ( nStartRU > 0 && nRU == 0 && nRD == 0 && nEndRD == 0 )
+ {
+ hvCase = "C";
+ if (!dryRun)
+ {
+ sscanf(internalMsg.Data(),"RU%10d[%10d:%10d]%80s",&dummy,&a,&b,r);
+ MarkForDeletion(indices,a,b);
+ }
+ }
+ else if ( nStartRU > 0 && nEndRD > 0 && nRD == 0 && nRU == 0 )
+ {
+ hvCase = "D";
+ if (!dryRun)
+ {
+ sscanf(internalMsg.Data(),"RU%10d[%10d:%10d]%80s",&dummy,&a,&b,r);
+ MarkForDeletion(indices,a,b-1);
+ Int_t i = internalMsg.Index("RD",strlen("RD"),0,TString::kExact);
+ sscanf(internalMsg(i,internalMsg.Length()-i).Data(),
+ "RD%10d[%10d:%10d]%80s",&dummy,&a,&b,r);
+ MarkForDeletion(indices,a+1,b);
+ }
+ }
+ else if ( nEndRD > 0 && nStartRU == 0 && nRU == 0 && nRD == 0 )
+ {
+ hvCase = "B";
+ if (!dryRun)
+ {
+ Int_t i = internalMsg.Index("RD",strlen("RD"),0,TString::kExact);
+ sscanf(internalMsg(i,internalMsg.Length()-i).Data(),
+ "RD%10d[%10d:%10d]%80s",&dummy,&a,&b,r);
+ MarkForDeletion(indices,a,b);
+ }
+ }
+ else if ( nFluct > 0 )
+ {
+ hvCase = "G";
+ if (!dryRun)
+ {
+ TObjArray* af = internalMsg.Tokenize(" ");
+ TIter next(af);
+ TObjString* str;
+ while ( ( str = static_cast<TObjString*>(next()) ) )
+ {
+ TString s(str->String());
+ if ( s.BeginsWith("FLUCT") )
+ {
+ sscanf(s.Data(),"FLUCT%d[%d:%d]",&dummy,&a,&b);
+ MarkForDeletion(indices,a,b);
+ }
+ }
+ delete af;
+ }
+ }
+ else if ( nEndAndShortRU > 0 && nStartRU == 0 && nRU == 0 && nRD == 0 && nEndRD == 0 )
+ {
+ hvCase = "H";
+ if (!dryRun)
+ {
+ sscanf(internalMsg.Data(),"RU%10d[%10d:%10d]%80s",&dummy,&a,&b,r);
+ MarkForDeletion(indices,a,b);
+ }
+ }
+ else
+ {
+ // last chance...
+ // here we know it's not a trip, so let's assume everything is OK
+ // if first and last value are in the same ballpark
+
+ const Double_t HVFLUCT(20); // volts
+
+ if ( TMath::Abs(vfirst->GetFloat() - vlast->GetFloat()) < HVFLUCT )
+ {
+ hvCase = "Z";
+ }
+ if (!dryRun)
+ {
+ MarkForDeletion(indices,1,nvalues-1);
+ }
+ }
+
+ if (!dryRun)
+ {
+ for ( Int_t i = 0; i < nvalues; ++i )
+ {
+ if ( indices[i] )
+ {
+ values.RemoveAt(i);
+ }
+ }
+
+ values.Compress();
+ }
+
+ delete[] indices;
+
+ if ( !values.GetEntries() )
+ {
+ AliErrorClass(Form("No value left after patch... Check that !!! initial # of values=%d msg=%s",
+ nvalues,internalMsg.Data()));
+ hvCase = "OTHER";
+ }
+
+ if (!dryRun)
+ {
+ // take the max of the remaining values
+ TIter nextA(&values);
+ AliDCSValue* val;
+ Float_t maxval(-9999);
+
+ while ( ( val = static_cast<AliDCSValue*>(nextA()) ) )
+ {
+ if ( val->GetFloat() > maxval )
+ {
+ maxval = val->GetFloat();
+ }
+ }
+
+ values.Clear();
+
+ values.Add(new AliDCSValue(maxval,meanTimeStamp));
+ }
+
+ // once the case is inferred, add a "CASE:%10d",hvCase.Data()
+ // to the msg
+ // so we can them sum up for all channels and get a summary per run...
+
+ internalMsg += Form("CASE:%s",hvCase.Data());
+
+ if (msg) *msg = internalMsg.Data();
+
+ return hvCase=="OTHER" ? kFALSE : kTRUE;
+}
+
+//_____________________________________________________________________________
+void AliMUONCalibrationData::AddToMap(const TMap& sourceMap,
+ TMap& destMap,
+ const TString& key,
+ const char* source,
+ const char* dest)
+{
+ /// Remap
+
+ TString newkey(key);
+
+ newkey.ReplaceAll(source,dest);
+
+ TPair* pair = static_cast<TPair*>(sourceMap.FindObject(key.Data()));
+
+ destMap.Add(new TObjString(newkey.Data()),pair->Value());
+}
+
+//_____________________________________________________________________________
+void AliMUONCalibrationData::PatchSt1DCSAliases(TMap& hvMap)
+{
+ /// It was discovered (in sept. 2013) that the DCS aliases for St1 was
+ /// wrongly assigned (in the hardware), so the correspondence between DCS channels
+ /// and actual HV channels is wrong for St1 in the DCS (and thus in the DCS archive,
+ /// and so in the OCDB HV object).
+ ///
+ /// It affects all the OCDB object written in 2010-2013.
+ ///
+ /// This method fixes that.
+
+ if ( hvMap.GetUniqueID() == fgkDCSSt1Flag )
+ {
+ // already clean object. Do nothing
+ return;
+ }
+
+ TIter next(&hvMap);
+ TObjString* hvChannelName;
+
+ TMap newmap;
+ newmap.SetOwnerKeyValue(kTRUE,kFALSE);
+
+ while ( ( hvChannelName = static_cast<TObjString*>(next()) ) )
+ {
+ TString name(hvChannelName->String());
+ TString newname(name);
+
+ // the problem is limited to St1 = ch1+ch2 (or, in DCS parlance, ch0+ch1)
+ // do it "by hand" as we "only" have 8 names to change
+
+ if ( name.Contains("Chamber00Left") )
+ {
+ if (name.Contains("Quad1Sect0")) AddToMap(hvMap,newmap,name,"Quad1Sect0","Quad2Sect0"); // channel 0 of Board00 (alidcscae020)
+
+ if (name.Contains("Quad1Sect1")) AddToMap(hvMap,newmap,name,"Quad1Sect1","Quad2Sect1"); // channel 1
+ if (name.Contains("Quad1Sect2")) AddToMap(hvMap,newmap,name,"Quad1Sect2","Quad2Sect2"); // channel 2
+
+ if (name.Contains("Quad2Sect2")) AddToMap(hvMap,newmap,name,"Quad2Sect2","Quad1Sect0"); // channel 3
+ if (name.Contains("Quad2Sect1")) AddToMap(hvMap,newmap,name,"Quad2Sect1","Quad1Sect1"); // channel 4
+ if (name.Contains("Quad2Sect0")) AddToMap(hvMap,newmap,name,"Quad2Sect0","Quad1Sect2"); // channel 5
+ }
+ else if ( name.Contains("Chamber01Left"))
+ {
+ if (name.Contains("Quad2Sect2")) AddToMap(hvMap,newmap,name,"Quad2Sect2","Quad2Sect0"); // channel 9 of Board00 (alidcscae020)
+ if (name.Contains("Quad2Sect0")) AddToMap(hvMap,newmap,name,"Quad2Sect0","Quad2Sect2"); // channel 11
+ }
+ else
+ {
+ AddToMap(hvMap,newmap,name,name,name);
+ }
+ }
+
+ // copy newmap to hvMap
+
+ TIter nextNewMap(&newmap);
+ while ( ( hvChannelName = static_cast<TObjString*>(nextNewMap()) ) )
+ {
+ TPair* oldPair = static_cast<TPair*>(hvMap.FindObject(hvChannelName->String().Data()));
+ TPair* newPair = static_cast<TPair*>(newmap.FindObject(hvChannelName->String().Data()));
+
+ TObjArray* newValues = static_cast<TObjArray*>(newPair->Value());
+
+ oldPair->SetValue(newValues);
+ }
+}
//_____________________________________________________________________________
TMap*
-AliMUONCalibrationData::CreateHV(Int_t runNumber, Int_t* startOfValidity)
+AliMUONCalibrationData::CreateHV(Int_t runNumber,
+ Int_t* startOfValidity,
+ Bool_t patched,
+ TList* messages,
+ Bool_t dryRun)
{
/// Create a new HV map from the OCDB for a given run
- return dynamic_cast<TMap*>(CreateObject(runNumber,"MUON/Calib/HV",startOfValidity));
+ ///
+ /// dryRun is only usefull with patched=kTRUE and non-empty messages) :
+ /// it allow to get the list of messages without altering the values at all
+ /// (A patch without a patch, so to speak...)
+ ///
+
+ TMap* hvMap = dynamic_cast<TMap*>(CreateObject(runNumber,"MUON/Calib/HV",startOfValidity));
+
+ if (!hvMap) return 0x0;
+
+ PatchSt1DCSAliases(*hvMap);
+
+ if (patched)
+ {
+ TIter next(hvMap);
+ TObjString* hvChannelName;
+
+ while ( ( hvChannelName = static_cast<TObjString*>(next()) ) )
+ {
+ TString name(hvChannelName->String());
+
+ if ( name.Contains("sw") ) continue; // skip switches
+
+ if ( name.Contains("iMon") ) continue; // skip HV currents
+
+ TPair* hvPair = static_cast<TPair*>(hvMap->FindObject(name.Data()));
+ TObjArray* values = static_cast<TObjArray*>(hvPair->Value());
+ if (!values)
+ {
+ AliErrorClass(Form("Could not get values for alias %s",name.Data()));
+ }
+ else
+ {
+ TString msg;
+
+ AliDebugClass(1,Form("channel %s",name.Data()));
+ Bool_t ok = PatchHVValues(*values,&msg,dryRun);
+
+ if ( messages )
+ {
+ messages->Add(new TObjString(Form("%s %s",hvChannelName->String().Data(),msg.Data())));
+ }
+
+ if (!ok)
+ {
+ AliErrorClass(Form("PatchHVValue was not successfull ! This is serious ! "
+ "You'll have to check the logic for channel %s in run %09d",
+ name.Data(),runNumber));
+ }
+ }
+ }
+
+ }
+
+ if ( messages )
+ {
+ Int_t a(0),b(0),c(0),d(0),e(0),f(0),g(0),h(0),u(0),z(0);
+ TIter next(messages);
+ TObjString* msg;
+ char hvCase('u');
+
+ while ( ( msg = static_cast<TObjString*>(next()) ) )
+ {
+ Int_t i = msg->String().Index("CASE",strlen("CASE"),0,TString::kExact);
+
+ if ( i >= 0 )
+ {
+ sscanf(msg->String()(i,msg->String().Length()-i).Data(),"CASE:%10c",&hvCase);
+ }
+
+ switch (hvCase)
+ {
+ case 'A': ++a; break;
+ case 'B': ++b; break;
+ case 'C': ++c; break;
+ case 'D': ++d; break;
+ case 'E': ++e; break;
+ case 'F': ++f; break;
+ case 'G': ++g; break;
+ case 'H': ++h; break;
+ case 'Z': ++z; break;
+ default: ++u; break;
+ }
+ }
+
+ messages->Add(new TObjString(Form("SUMMARY : # of cases A(%3d) B(%3d) C(%3d) D(%3d) E(%3d) F(%3d) G(%3d) H(%3d) Z(%3d) OTHER(%3d)",
+ a,b,c,d,e,f,g,h,z,u)));
+ }
+
+ return hvMap;
}
//_____________________________________________________________________________
/// Access the CDB for a given path (e.g. MUON/Calib/Pedestals),
/// and return the corresponding TObject.
- AliCodeTimerAutoClass(Form("%d : %s",runNumber,path),0);
+ AliCodeTimerAutoClass(Form("%09d : %s",runNumber,path),0);
AliCDBManager* man = AliCDBManager::Instance();
if ( startOfValidity ) *startOfValidity = entry->GetId().GetFirstRun();
TObject* object = entry->GetObject();
- entry->SetOwner(kFALSE);
- if (!(man->GetCacheFlag())) delete entry;
+ if (!(man->GetCacheFlag()))
+ {
+ entry->SetOwner(kFALSE);
+ delete entry;
+ }
+// else
+// {
+// entry->SetOwner(kTRUE); //FIXME : this should be done but is causing problems with RecoParams at the end of the reco : investigate why...
+// }
return object;
}
else
{
- AliCodeTimerAutoClass(Form("Failed to get %s for run %d",path,runNumber),1);
+ AliCodeTimerAutoClass(Form("Failed to get %s for run %09d",path,runNumber),1);
}
AliMUONCalibrationData::Gains() const
{
/// Create (if needed) and return the internal store for gains.
- if (fBypassGains) return fBypassGains;
+ if (fgBypassGains) return fgBypassGains;
if (!fGains)
{
}
return fGains;
}
-
+
//_____________________________________________________________________________
AliMUONVCalibParam*
AliMUONCalibrationData::Gains(Int_t detElemId, Int_t manuId) const
//_____________________________________________________________________________
TMap*
-AliMUONCalibrationData::HV() const
+AliMUONCalibrationData::HV(Bool_t patched) const
{
/// Return the calibration for a given (detElemId, manuId) pair
if (!fHV)
{
- fHV = CreateHV(fRunNumber);
+ fHV = CreateHV(fRunNumber,0,patched);
}
return fHV;
}
AliMUONCalibrationData::BypassStores(AliMUONVStore* ped, AliMUONVStore* gain)
{
/// Force the use of those pedestals and gains
- fBypassPedestals = ped;
- fBypassGains = gain;
+ fgBypassPedestals = ped;
+ fgBypassGains = gain;
}
{
/// Return pedestals
- if (fBypassPedestals) return fBypassPedestals;
+ if (fgBypassPedestals) return fgBypassPedestals;
if (!fPedestals)
{
{
/// Reset all data
+ AliCodeTimerAuto("",0);
+
delete fConfig;
fConfig = 0x0;
delete fPedestals;
AliInfoClass("TriggerEfficiency read OK");
}
}
-
-
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff