X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCSensorTempArray.cxx;h=fc854f3ccaed28b87269161a9cb01eb9e2e84e6c;hb=1e4ec417458b79766a8e47989ae9e9e7e45cd642;hp=b7ddb1bf105433bbe7e61e702f511e9c23ff38d6;hpb=67a165ed541d2da2e70a099e742a014422a47b4e;p=u%2Fmrichter%2FAliRoot.git diff --git a/TPC/AliTPCSensorTempArray.cxx b/TPC/AliTPCSensorTempArray.cxx index b7ddb1bf105..fc854f3ccae 100644 --- a/TPC/AliTPCSensorTempArray.cxx +++ b/TPC/AliTPCSensorTempArray.cxx @@ -49,10 +49,11 @@ AliTPCSensorTempArray::AliTPCSensorTempArray(Int_t run) : AliDCSSensorArray() AliCDBEntry *entry = AliCDBManager::Instance()->Get("TPC/Config/Temperature",run); - TTree *tree = (TTree*) entry->GetObject(); - fSensors = AliTPCSensorTemp::ReadTree(tree); - fSensors->BypassStreamer(kFALSE); - + if (entry) { + TTree *tree = (TTree*) entry->GetObject(); + fSensors = AliTPCSensorTemp::ReadTree(tree); + fSensors->BypassStreamer(kFALSE); + } } //_____________________________________________________________________________ AliTPCSensorTempArray::AliTPCSensorTempArray(UInt_t startTime, UInt_t endTime, @@ -65,18 +66,19 @@ AliTPCSensorTempArray::AliTPCSensorTempArray(UInt_t startTime, UInt_t endTime, // fSensors = AliTPCSensorTemp::ReadTree(confTree,amandaString); fSensors->BypassStreamer(kFALSE); - fStartTime = TTimeStamp(startTime); - fEndTime = TTimeStamp(endTime); + fStartTime = TTimeStamp((time_t)startTime,0); + fEndTime = TTimeStamp((time_t)endTime,0); } //_____________________________________________________________________________ -AliTPCSensorTempArray::AliTPCSensorTempArray(const char *fname) : +AliTPCSensorTempArray::AliTPCSensorTempArray(const char *fname, + const TString& amandaString) : AliDCSSensorArray() { // // AliTPCSensorTempArray constructor // - fSensors = AliTPCSensorTemp::ReadList(fname); + fSensors = AliTPCSensorTemp::ReadList(fname,amandaString); fSensors->BypassStreamer(kFALSE); } @@ -121,8 +123,12 @@ void AliTPCSensorTempArray::ReadSensors(const char *dbEntry) // Read list of temperature sensors from text file // AliCDBEntry *entry = AliCDBManager::Instance()->Get(dbEntry); + if (!entry) { + AliWarning(Form("No OCDB entry %s available\n",dbEntry)); + return; + } TTree *tree = (TTree*) entry->GetObject(); - fSensors = AliTPCSensorTemp::ReadTree(tree); + if (tree) fSensors = AliTPCSensorTemp::ReadTree(tree); }