Set default ntimebis = 30 in simulation and check for -1 in OCDB

diff --git a/TRD/AliTRDSimParam.cxx b/TRD/AliTRDSimParam.cxx
index bf9cb90286a041e5af42e5731e877208af427788..4481690c9678958e48a951c5ad29528100466765 100644 (file)
--- a/TRD/AliTRDSimParam.cxx
+++ b/TRD/AliTRDSimParam.cxx
@@ -152,7 +152,7 @@ void AliTRDSimParam::Init()
   fPRFOn             = kTRUE;
 
   // The number of time bins
-  fNTimeBins         = 24;
+  fNTimeBins         = 30;
 
   ReInit();
 

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index ce03cfe6d25a715e72cf9a76db8dc52175b42b90..7022450ce7a110fa8ea273d6eb9b22261ede7ab1 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -819,7 +819,9 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   fTimeTotal = fDigits->GetNtime();
 
   // Check consistency between OCDB and raw data
-  if (fTimeTotal != calibration->GetNumberOfTimeBinsDCS()) {
+  Int_t nTimeOCDB = calibration->GetNumberOfTimeBinsDCS();
+  if ((nTimeOCDB  >         -1) &&
+      (fTimeTotal != nTimeOCDB)) {
     AliError(Form("Number of timebins does not match OCDB value (RAW[%d] OCDB[%d])"
                 ,fTimeTotal,calibration->GetNumberOfTimeBinsDCS()));
   }

diff --git a/TRD/AliTRDdigitsParam.cxx b/TRD/AliTRDdigitsParam.cxx
index 1911a2032f6c561d00725ddafeee3419a04db0c2..e465802e070e706716e3e0a831302964edc0f841 100644 (file)
--- a/TRD/AliTRDdigitsParam.cxx
+++ b/TRD/AliTRDdigitsParam.cxx
@@ -122,13 +122,18 @@ Bool_t AliTRDdigitsParam::SetNTimeBins(Int_t ntb)
 
   if (fCheckOCDB) {
     Int_t nTimeBinsOCDB = AliTRDcalibDB::Instance()->GetNumberOfTimeBinsDCS();
-    if (fNTimeBins == nTimeBinsOCDB) {
-      return kTRUE;
+    if (nTimeBinsOCDB > -1) {
+      if (fNTimeBins == nTimeBinsOCDB) {
+        return kTRUE;
+      }
+      else {
+        AliError(Form("Number of timebins does not match OCDB value (raw:%d, OCDB:%d)"
+                     ,fNTimeBins,nTimeBinsOCDB));
+        return kFALSE;
+      }
     }
     else {
-      AliError(Form("Number of timebins does not match OCDB value (raw:%d, OCDB:%d)"
-                   ,fNTimeBins,nTimeBinsOCDB));
-      return kFALSE;
+      return kTRUE;
     }
   }
   else {