Fix Coverity defects

[u/mrichter/AliRoot.git] / TRD / AliTRDcalibDB.cxx

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index 6c89372de2d9c2f8f33593e6c65ffd881525f709..2cfdea203eb3df15d721af12cd4f9b5b57748c8b 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -594,12 +594,13 @@ Float_t AliTRDcalibDB::GetT0Average(Int_t det)
     return -1;
   }
 
-  Double_t mean = 0.0; 
+  Double_t sum = 0.0; 
   for (Int_t channel = 0; channel < roc->GetNchannels(); ++channel) {
-    mean += (calDet->GetValue(det) + roc->GetValue(channel)) / roc->GetNchannels();
+    sum += roc->GetValue(channel);
   }
-
-  return mean;
+  sum /= roc->GetNchannels();
+  sum += calDet->GetValue(det);
+  return sum;
 
 }
 
@@ -743,50 +744,52 @@ Int_t AliTRDcalibDB::GetNumberOfTimeBinsDCS()
   // Returns Number of time bins from the DCS
   //
 
+  Int_t nMixed = -2; // not the same number for all chambers
+  Int_t nUndef = -1; // default value - has not been set!
+  Int_t nTbSor = nUndef;
+  Int_t nTbEor = nUndef;
+
   const TObjArray *dcsArr = dynamic_cast<const TObjArray *>(GetCachedCDBObject(kIDDCS));
 
-  if(!dcsArr){
-    printf("No DCS Object found\n");
-    //return -1;
-    return 30;
+  if (!dcsArr) {
+    AliError("No DCS object found!");
+    return nUndef;
   }
-  const AliTRDCalDCS *calDCSsor = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(0)); // Take SOR
+
+  const AliTRDCalDCS *calDCSsor = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(0));
   const AliTRDCalDCS *calDCSeor = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(1));
 
-  // prefer SOR
-  if(!calDCSsor){
-    if(!calDCSeor){
-      printf("No calDCSeor found\n");
-      //return -1;
-      return 30;
-    }
-    if(calDCSeor->GetGlobalNumberOfTimeBins() > 0.0) return calDCSeor->GetGlobalNumberOfTimeBins();
-    else return 30;
-  }
-  // if SOR is available and the number of timebins is > -1, take this, otherwise check EOR
-  Int_t nTimeSOR = calDCSsor->GetGlobalNumberOfTimeBins();
-  if(nTimeSOR > -1){
-    // Make a consistency check
-    if(calDCSeor){
-      Int_t nTimeEOR = calDCSeor->GetGlobalNumberOfTimeBins();
-      if((nTimeEOR > -1) && (nTimeSOR != nTimeEOR)){
-        // Parameter inconsistency found, return -2 to be able to catch the error
-        //return -2;
-       printf("Inconsistency\n");
-       return 30;
-      }
+  if (!calDCSsor) {
+    // the SOR file is mandatory
+    AliError("NO SOR AliTRDCalDCS object found in CDB file!");
+    return nUndef;
     }
-    // Consisency check passed or not done
-    if(nTimeSOR > 0.0) return nTimeSOR;
-    else return 30;
-  } else {
-    // SOR has unphysical time parameter, take EOR
-    if(calDCSeor) {
-     if(calDCSeor->GetGlobalNumberOfTimeBins() > 0.0) return calDCSeor->GetGlobalNumberOfTimeBins(); 
-     else return 30;
+
+  if (!calDCSeor) {
+    // this can happen if the run is shorter than a couple of seconds.
+    AliWarning("NO EOR AliTRDCalDCS object found in CDB file.");
     }
-    return 30;  // Both SOR and EOR not available
+
+  // get the numbers
+  nTbSor = calDCSsor->GetGlobalNumberOfTimeBins();
+  if (calDCSeor) nTbEor = calDCSeor->GetGlobalNumberOfTimeBins();
+
+  // if they're the same return the value
+  // -2 means mixed, -1: no data, >= 0: good number of time bins
+  if (nTbSor == nTbEor) return nTbSor;
+
+  // if they're differing:
+  if (nTbSor == nMixed || nTbEor == nMixed) {
+    AliWarning("Inconsistent number of time bins found!");
+    return nMixed;
   }
+  
+  // one is undefined, the other ok -> return that one
+  if (nTbSor == nUndef) return nTbEor;
+  if (nTbEor == nUndef) return nTbSor;
+
+  // only remains: two different numbers >= 0
+  return nMixed;
 }
 
 //_____________________________________________________________________________
@@ -808,7 +811,68 @@ void AliTRDcalibDB::GetFilterType(TString &filterType)
     return;
   } 
   filterType = calDCS->GetGlobalFilterType();
+}
 
+//_____________________________________________________________________________
+void AliTRDcalibDB::GetGlobalConfiguration(TString &config){
+  //
+  // Get Configuration from the DCS
+  //
+  const TObjArray *dcsArr = dynamic_cast<const TObjArray *>(GetCachedCDBObject(kIDDCS));
+  if(!dcsArr){
+    config = "";
+    return;
+  }
+  const AliTRDCalDCS *calDCS = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(1)); // Take EOR
+  
+  if(!calDCS){
+    config = "";
+    return;
+  } 
+  config = calDCS->GetGlobalConfigName();
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDcalibDB::HasOnlineFilterPedestal()
+{
+  //
+  // Checks whether pedestal filter was applied online
+  //
+  TString cname;
+  // Temporary: Get the filter config from the configuration name
+  GetGlobalConfiguration(cname);
+  TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+  // TString filterconfig;
+  //GetFilterType(filterconfig);
+  return filterconfig.Contains("p");
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDcalibDB::HasOnlineFilterGain(){
+  //
+  // Checks whether online gain filter was applied
+  //
+  TString cname;
+  // Temporary: Get the filter config from the configuration name
+  GetGlobalConfiguration(cname);
+  TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+  //TString filterconfig;
+  //GetFilterType(filterconfig);
+  return filterconfig.Contains("g");
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDcalibDB::HasOnlineTailCancellation(){
+  //
+  // Checks whether online tail cancellation was applied
+  //
+  TString cname;
+  // Temporary: Get the filter config from the configuration name
+  GetGlobalConfiguration(cname);
+  TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+  //TString filterconfig;
+  //GetFilterType(filterconfig);
+  return filterconfig.Contains("t");
 }
 
 //_____________________________________________________________________________