From 2cd3a6975223d7030e112b5356fd747aa58e6b44 Mon Sep 17 00:00:00 2001 From: marian Date: Tue, 9 Nov 2010 01:18:02 +0000 Subject: [PATCH] Reverting back changes for the Cavern Pressure sensor 2 because AliGRPObject::GetCavernAtmosPressure2() gives empty graphs --- TPC/AliTPCcalibDB.cxx | 7 ++++--- TPC/AliTPCcalibDButil.cxx | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TPC/AliTPCcalibDB.cxx b/TPC/AliTPCcalibDB.cxx index cc34f5d0635..aa34eb77953 100644 --- a/TPC/AliTPCcalibDB.cxx +++ b/TPC/AliTPCcalibDB.cxx @@ -1093,7 +1093,7 @@ AliDCSSensor * AliTPCcalibDB::GetPressureSensor(Int_t run, Int_t type){ if (map){ AliDCSSensor * sensor = 0; TObject *osensor=0; - if (type==0) osensor = ((*map)("fCavernPressure2")); + if (type==0) osensor = ((*map)("fCavernPressure")); if (type==1) osensor = ((*map)("fP2Pressure")); sensor =dynamic_cast(osensor); if (sensor) return sensor; @@ -1107,7 +1107,7 @@ AliDCSSensor * AliTPCcalibDB::GetPressureSensor(Int_t run, Int_t type){ grpRun = dynamic_cast(fGRPArray.At(run)); if (!grpRun) return 0; } - AliDCSSensor * sensor = grpRun->GetCavernAtmosPressure2(); + AliDCSSensor * sensor = grpRun->GetCavernAtmosPressure(); if (type==1) sensor = grpRun->GetSurfaceAtmosPressure(); return sensor; } @@ -1627,7 +1627,7 @@ AliGRPObject * AliTPCcalibDB::MakeGRPObjectFromMap(TMap *map){ if (!sensor) return 0; // AliDCSSensor * sensor2 = new AliDCSSensor(*sensor); - osensor = ((*map)("fCavernPressure2")); + osensor = ((*map)("fCavernPressure")); TGraph * gr = new TGraph(2); gr->GetX()[0]= -100000.; gr->GetX()[1]= 1000000.; @@ -1640,6 +1640,7 @@ AliGRPObject * AliTPCcalibDB::MakeGRPObjectFromMap(TMap *map){ AliGRPObject *grpRun = new AliGRPObject; grpRun->ReadValuesFromMap(map); grpRun->SetCavernAtmosPressure(sensor2); + grpRun->SetCavernAtmosPressure(sensor2); grpRun->SetSurfaceAtmosPressure(sensor); return grpRun; } diff --git a/TPC/AliTPCcalibDButil.cxx b/TPC/AliTPCcalibDButil.cxx index 31745a205b9..fbf75a13cd1 100644 --- a/TPC/AliTPCcalibDButil.cxx +++ b/TPC/AliTPCcalibDButil.cxx @@ -1945,7 +1945,7 @@ Double_t AliTPCcalibDButil::GetVDriftTPCLaserTracksOnline(Double_t &dist, Int_t TObjArray* cearray =AliTPCcalibDB::Instance()->GetCEData(); AliTPCSensorTempArray *temp = (AliTPCSensorTempArray*)cearray->FindObject("TempMap"); - AliDCSSensor *press = (AliDCSSensor*)cearray->FindObject("CavernAtmosPressure2"); + AliDCSSensor *press = (AliDCSSensor*)cearray->FindObject("CavernAtmosPressure"); Double_t corrPTA=0; Double_t corrPTC=0; @@ -2511,7 +2511,7 @@ void AliTPCcalibDButil::FilterCE(Double_t deltaT, Double_t cutAbs, Double_t cutS // // AliTPCSensorTempArray *tempMapCE = (AliTPCSensorTempArray *)cearray->FindObject("TempMap"); - AliDCSSensor * cavernPressureCE = (AliDCSSensor *) cearray->FindObject("CavernAtmosPressure2"); + AliDCSSensor * cavernPressureCE = (AliDCSSensor *) cearray->FindObject("CavernAtmosPressure"); if ( tempMapCE && cavernPressureCE){ // // Bool_t isOK = FilterTemperature(tempMapCE)>0.1; -- 2.39.3