// Simulation: applied in the AliTPC::MakeSector - adding offset
// Reconstruction: AliTPCTransform::Transform() - remove offset
// AliTPCTransform::Transform() - to be called
-// in AliTPCtracker::Transform()
+// in AliTPCtrackerMI::Transform()
//
//
// 2.) Space points transformation:
fCalibRaw(0),
fDataQA(0),
fALTROConfigData(0),
+ fIonTailArray(0),
fPulserData(0),
fCEData(0),
fTemperature(0),
fParam(0),
fClusterParam(0),
fTimeGainSplines(0),
- fTimeGainSplinesArray(100000),
- fGRPArray(100000), //! array of GRPs - per run - JUST for calibration studies
- fGRPMaps(100000), //! array of GRPs - per run - JUST for calibration studies
- fGoofieArray(100000), //! array of GOOFIE values -per run - Just for calibration studies
- fVoltageArray(100000),
- fTemperatureArray(100000), //! array of temperature sensors - per run - Just for calibration studies
- fVdriftArray(100000), //! array of v drift interfaces
- fDriftCorrectionArray(100000), //! array of drift correction
- fRunList(100000), //! run list - indicates try to get the run param
+ fTimeGainSplinesArray(1),
+ fGRPArray(1), //! array of GRPs - per run - JUST for calibration studies
+ fGRPMaps(1), //! array of GRPs - per run - JUST for calibration studies
+ fGoofieArray(1), //! array of GOOFIE values -per run - Just for calibration studies
+ fVoltageArray(1),
+ fTemperatureArray(1), //! array of temperature sensors - per run - Just for calibration studies
+ fVdriftArray(1), //! array of v drift interfaces
+ fDriftCorrectionArray(1), //! array of drift correction
+ fRunList(1), //! run list - indicates try to get the run param
fBHasAlignmentOCDB(kFALSE), // Flag - has the alignment on the composed correction ?
fDButil(0),
fCTPTimeParams(0),
//
fgInstance=this;
Update(); // temporary
+ fTimeGainSplinesArray.SetOwner(); //own the keys
+ fGRPArray.SetOwner(); //own the keys
+ fGRPMaps.SetOwner(); //own the keys
+ fGoofieArray.SetOwner(); //own the keys
+ fVoltageArray.SetOwner(); //own the keys
+ fTemperatureArray.SetOwner(); //own the keys
+ fVdriftArray.SetOwner(); //own the keys
+ fDriftCorrectionArray.SetOwner(); //own the keys
}
AliTPCcalibDB::AliTPCcalibDB(const AliTPCcalibDB& ):
fCalibRaw(0),
fDataQA(0),
fALTROConfigData(0),
+ fIonTailArray(0),
fPulserData(0),
fCEData(0),
fTemperature(0),
fParam(0),
fClusterParam(0),
fTimeGainSplines(0),
- fTimeGainSplinesArray(100000),
+ fTimeGainSplinesArray(1),
fGRPArray(0), //! array of GRPs - per run - JUST for calibration studies
fGRPMaps(0), //! array of GRPs - per run - JUST for calibration studies
fGoofieArray(0), //! array of GOOFIE values -per run - Just for calibration studies
// Copy constructor invalid -- singleton implementation
//
Error("copy constructor","invalid -- singleton implementation");
+ fTimeGainSplinesArray.SetOwner(); //own the keys
+ fGRPArray.SetOwner(); //own the keys
+ fGRPMaps.SetOwner(); //own the keys
+ fGoofieArray.SetOwner(); //own the keys
+ fVoltageArray.SetOwner(); //own the keys
+ fTemperatureArray.SetOwner(); //own the keys
+ fVdriftArray.SetOwner(); //own the keys
+ fDriftCorrectionArray.SetOwner(); //own the keys
}
AliTPCcalibDB& AliTPCcalibDB::operator= (const AliTPCcalibDB& )
if (entry){
//if (fPadNoise) delete fPadNoise;
entry->SetOwner(kTRUE);
- fParam = (AliTPCParam*)(entry->GetObject()->Clone());
+ fParam = (AliTPCParam*)(entry->GetObject());
}else{
AliFatal("TPC - Missing calibration entry TPC/Calib/Parameters");
}
entry = GetCDBEntry("TPC/Calib/ClusterParam");
if (entry){
entry->SetOwner(kTRUE);
- fClusterParam = (AliTPCClusterParam*)(entry->GetObject()->Clone());
+ fClusterParam = (AliTPCClusterParam*)(entry->GetObject());
}else{
AliFatal("TPC - Missing calibration entry");
}
fPulserData=(TObjArray*)(entry->GetObject());
}
+ //Calibration ION tail data
+ // entry = GetCDBEntry("TPC/Calib/IonTail");
+// if (entry){
+// entry->SetOwner(kTRUE);
+// fIonTailArray=(TObjArray*)(entry->GetObject());
+// }
+
+
//CE data
entry = GetCDBEntry("TPC/Calib/CE");
if (entry){
fDataQA=dynamic_cast<AliTPCdataQA*>(entry->GetObject());
}
// High voltage
- if (fRun>=0 && !fVoltageArray.At(fRun)){
+ if (fRun>=0 && !fVoltageArray.GetValue(Form("%i",fRun))){
entry = AliCDBManager::Instance()->Get("TPC/Calib/HighVoltage",fRun);
if (entry) {
- fVoltageArray.AddAt(entry->GetObject(),fRun);
+ fVoltageArray.Add(new TObjString(Form("%i",fRun)),entry->GetObject());
}
}
TObjString *sObjType = (TObjString*)(arrNextCol->At(0));
TObjString *sObjFileName = (TObjString*)(arrNextCol->At(1));
-
+ delete arrNextCol;
+
if ( !sObjType || ! sObjFileName ) continue;
TString sType(sObjType->GetString());
TString sFileName(sObjFileName->GetString());
}
delete fIn;
}
+ delete arrFileLine;
}
Int_t AliTPCcalibDB::InitDeadMap() {
chamberMedian[iROC]=0;
TGraph *gr=sensor->GetGraph();
AliSplineFit *fit=sensor->GetFit();
- Int_t nmax=0;
+ Int_t nmax=1;
Int_t nout=0;
if ( gr && gr->GetN()>0 ){
nmax=gr->GetN();
// - > Don't use it for reconstruction - Only for Calibration studies
//
if (run<=0) return;
+ TObjString runstr(Form("%i",run));
fRun=run;
AliCDBEntry * entry = 0;
if (run>= fRunList.fN){
fRunList.Set(run*2+1);
- fGRPArray.Expand(run*2+1);
- fGRPMaps.Expand(run*2+1);
- fGoofieArray.Expand(run*2+1);
- fVoltageArray.Expand(run*2+1);
- fTemperatureArray.Expand(run*2+1);
- fVdriftArray.Expand(run*2+1);
- fDriftCorrectionArray.Expand(run*2+1);
- fTimeGainSplinesArray.Expand(run*2+1);
//
//
fALTROConfigData->Expand(run*2+1); // ALTRO configuration data
//grpRun->ReadValuesFromMap(map);
grpRun = MakeGRPObjectFromMap(map);
- fGRPMaps.AddAt(map,run);
+ fGRPMaps.Add(new TObjString(runstr),map);
}
}
- fGRPArray.AddAt(grpRun,run);
+ fGRPArray.Add(new TObjString(runstr),grpRun);
}
entry = AliCDBManager::Instance()->Get("TPC/Calib/Goofie",run);
if (entry){
- fGoofieArray.AddAt(entry->GetObject(),run);
+ fGoofieArray.Add(new TObjString(runstr),entry->GetObject());
}
//
//
entry = AliCDBManager::Instance()->Get("TPC/Calib/TimeGain",run);
if (entry) {
- fTimeGainSplinesArray.AddAt(entry->GetObject(),run);
+ fTimeGainSplinesArray.Add(new TObjString(runstr),entry->GetObject());
}else{
AliFatal("TPC - Missing calibration entry TimeGain");
}
entry = AliCDBManager::Instance()->Get("TPC/Calib/TimeDrift",run);
if (entry) {
TObjArray * timeArray = (TObjArray*)entry->GetObject();
- fDriftCorrectionArray.AddAt(entry->GetObject(),run);
+ fDriftCorrectionArray.Add(new TObjString(runstr),entry->GetObject());
AliTPCCorrection * correctionTime = (AliTPCCorrection *)timeArray->FindObject("FitCorrectionTime");
if (correctionTime && fComposedCorrectionArray){
correctionTime->Init();
//
entry = AliCDBManager::Instance()->Get("TPC/Calib/Temperature",run);
if (entry) {
- fTemperatureArray.AddAt(entry->GetObject(),run);
+ fTemperatureArray.Add(new TObjString(runstr),entry->GetObject());
}
// High voltage
entry = AliCDBManager::Instance()->Get("TPC/Calib/HighVoltage",run);
- if (!fVoltageArray.At(run) && entry) {
- fVoltageArray.AddAt(entry->GetObject(),run);
+ if (!fVoltageArray.GetValue(runstr.GetName()) && entry) {
+ fVoltageArray.Add(new TObjString(runstr),entry->GetObject());
}
//apply fDButil filters
if (press && temp &&accept){
AliTPCCalibVdrift * vdrift = new AliTPCCalibVdrift(temp, press,0);
- fVdriftArray.AddAt(vdrift,run);
+ fVdriftArray.Add(new TObjString(runstr),vdrift);
}
fDButil->FilterCE(120., 3., 4.,0);
//
// Get GRP object for given run
//
- if (run>= ((Instance()->fGRPArray)).GetEntriesFast()){
- Instance()->UpdateRunInformations(run);
- }
- AliGRPObject * grpRun = dynamic_cast<AliGRPObject *>((Instance()->fGRPArray).At(run));
+ AliGRPObject * grpRun = dynamic_cast<AliGRPObject *>((Instance()->fGRPArray).GetValue(Form("%i",run)));
if (!grpRun) {
Instance()->UpdateRunInformations(run);
- grpRun = dynamic_cast<AliGRPObject *>(Instance()->fGRPArray.At(run));
+ grpRun = dynamic_cast<AliGRPObject *>(Instance()->fGRPArray.GetValue(Form("%i",run)));
if (!grpRun) return 0;
}
return grpRun;
//
// Get GRP map for given run
//
- TMap * grpRun = dynamic_cast<TMap *>((Instance()->fGRPMaps).At(run));
+ TMap * grpRun = dynamic_cast<TMap *>((Instance()->fGRPMaps).GetValue(Form("%i",run)));
if (!grpRun) {
Instance()->UpdateRunInformations(run);
- grpRun = dynamic_cast<TMap *>(Instance()->fGRPMaps.At(run));
+ grpRun = dynamic_cast<TMap *>(Instance()->fGRPMaps.GetValue(Form("%i",run)));
if (!grpRun) return 0;
}
return grpRun;
//
// If not map try to get it from the GRPObject
//
- AliGRPObject * grpRun = dynamic_cast<AliGRPObject *>(fGRPArray.At(run));
+ AliGRPObject * grpRun = dynamic_cast<AliGRPObject *>(fGRPArray.GetValue(Form("%i",run)));
if (!grpRun) {
UpdateRunInformations(run);
- grpRun = dynamic_cast<AliGRPObject *>(fGRPArray.At(run));
+ grpRun = dynamic_cast<AliGRPObject *>(fGRPArray.GetValue(Form("%i",run)));
if (!grpRun) return 0;
}
AliDCSSensor * sensor = grpRun->GetCavernAtmosPressure();
//
// Get temperature sensor array
//
- AliTPCSensorTempArray * tempArray = (AliTPCSensorTempArray *)fTemperatureArray.At(run);
+ AliTPCSensorTempArray * tempArray = (AliTPCSensorTempArray *)fTemperatureArray.GetValue(Form("%i",run));
if (!tempArray) {
UpdateRunInformations(run);
- tempArray = (AliTPCSensorTempArray *)fTemperatureArray.At(run);
+ tempArray = (AliTPCSensorTempArray *)fTemperatureArray.GetValue(Form("%i",run));
}
return tempArray;
}
//
// Get temperature sensor array
//
- TObjArray * gainSplines = (TObjArray *)fTimeGainSplinesArray.At(run);
+ TObjArray * gainSplines = (TObjArray *)fTimeGainSplinesArray.GetValue(Form("%i",run));
if (!gainSplines) {
UpdateRunInformations(run);
- gainSplines = (TObjArray *)fTimeGainSplinesArray.At(run);
+ gainSplines = (TObjArray *)fTimeGainSplinesArray.GetValue(Form("%i",run));
}
return gainSplines;
}
//
// Get drift spline array
//
- TObjArray * driftSplines = (TObjArray *)fDriftCorrectionArray.At(run);
+ TObjArray * driftSplines = (TObjArray *)fDriftCorrectionArray.GetValue(Form("%i",run));
if (!driftSplines) {
UpdateRunInformations(run);
- driftSplines = (TObjArray *)fDriftCorrectionArray.At(run);
+ driftSplines = (TObjArray *)fDriftCorrectionArray.GetValue(Form("%i",run));
}
return driftSplines;
}
//
// Get temperature sensor array
//
- AliDCSSensorArray * voltageArray = (AliDCSSensorArray *)fVoltageArray.At(run);
+ AliDCSSensorArray * voltageArray = (AliDCSSensorArray *)fVoltageArray.GetValue(Form("%i",run));
if (!voltageArray) {
UpdateRunInformations(run);
- voltageArray = (AliDCSSensorArray *)fVoltageArray.At(run);
+ voltageArray = (AliDCSSensorArray *)fVoltageArray.GetValue(Form("%i",run));
}
return voltageArray;
}
//
// Get temperature sensor array
//
- AliDCSSensorArray * goofieArray = (AliDCSSensorArray *)fGoofieArray.At(run);
+ AliDCSSensorArray * goofieArray = (AliDCSSensorArray *)fGoofieArray.GetValue(Form("%i",run));
if (!goofieArray) {
UpdateRunInformations(run);
- goofieArray = (AliDCSSensorArray *)fGoofieArray.At(run);
+ goofieArray = (AliDCSSensorArray *)fGoofieArray.GetValue(Form("%i",run));
}
return goofieArray;
}
//
// Get the interface to the the vdrift
//
- if (run>=fVdriftArray.GetEntriesFast()) UpdateRunInformations(run);
- AliTPCCalibVdrift * vdrift = (AliTPCCalibVdrift*)fVdriftArray.At(run);
+ AliTPCCalibVdrift * vdrift = (AliTPCCalibVdrift*)fVdriftArray.GetValue(Form("%i",run));
if (!vdrift) {
UpdateRunInformations(run);
- vdrift= (AliTPCCalibVdrift*)fVdriftArray.At(run);
+ vdrift= (AliTPCCalibVdrift*)fVdriftArray.GetValue(Form("%i",run));
}
return vdrift;
}
if (val==0 ){
Double_t x,y;
gr->GetPoint(0,x,y);
- Int_t time=TMath::Nint(sensor->GetStartTime()+x*3600); //time in graph is hours
- if ((time-timeStamp)<5*60) val=y;
+ const Int_t time=TMath::Nint(sensor->GetStartTime()+x*3600); //time in graph is hours
+ const Int_t dtime=time-timeStamp;
+ if ( (dtime>0) && (dtime<5*60) ) val=y;
}
//last point
if (val==0 ){
Double_t x,y;
gr->GetPoint(gr->GetN()-1,x,y);
- Int_t time=TMath::Nint(sensor->GetStartTime()+x*3600); //time in graph is hours
- if ((timeStamp-time)<5*60) val=y;
+ const Int_t time=TMath::Nint(sensor->GetStartTime()+x*3600); //time in graph is hours
+ const Int_t dtime=timeStamp-time;
+ if ( (dtime>0) && (dtime<5*60) ) val=y;
}
} else {
val=sensor->GetValue(timeStamp);
//
TString file(filename);
- if (file.IsNull()) file=Form("guiTreeRun_%lld.root",fRun);
+ if (file.IsNull()) file=Form("guiTreeRun_%i.root",fRun);
prep.DumpToFile(file.Data());
return kTRUE;
}
// use TPC-ITS if present
TGraphErrors *gr= (TGraphErrors*)array->FindObject("ALIGN_ITSB_TPC_VDGY");
+ if (!gr) gr = (TGraphErrors*)array->FindObject("ALIGN_TOFB_TPC_VDGY");
if(gr) {
result = AliTPCcalibDButil::EvalGraphConst(gr,timeStamp);
//
if (!fComposedCorrectionArray) return 0;
if (fRun<0) return 0;
- if (fDriftCorrectionArray.GetEntriesFast()<=fRun) return 0;
- if (fDriftCorrectionArray.At(fRun)==0) return 0;
+ if (fDriftCorrectionArray.GetValue(Form("%i",fRun))==0) return 0;
if (fComposedCorrectionArray->GetEntriesFast()<=4) {
fComposedCorrectionArray->Expand(5);
- TObjArray * timeArray =(TObjArray*)(fDriftCorrectionArray.At(fRun));
+ TObjArray * timeArray =(TObjArray*)(fDriftCorrectionArray.GetValue(Form("%i",fRun)));
AliTPCCorrection * correctionTime = (AliTPCCorrection *)timeArray->FindObject("FitCorrectionTime");
if (correctionTime){
correctionTime->Init();
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff