Update of the VZERO offline trigger: 1. New slewing correction with only 2 parameters...

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

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index 12221d9f4d1289d34310d79a23079ef9d5e0484b..3f06fa88c265d2d6e46589c11095b471c4e79bf0 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -616,6 +616,7 @@ Bool_t AliTRDclusterizer::MakeClusters()
     fDigitsManager->RemoveDictionaries(i);      
     fDigitsManager->ClearIndexes(i);  
   }
+  fReconstructor->SetDigitsParam(fDigitsManager->GetDigitsParam());
   
   if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
 
@@ -685,6 +686,7 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
     if (!fReconstructor->IsWritingTracklets()) continue;
     if (*(fTrackletContainer[0]) > 0 || *(fTrackletContainer[1]) > 0) WriteTracklets(det);
   }
+  fReconstructor->SetDigitsParam(fDigitsManager->GetDigitsParam());
   
   if (fTrackletContainer){
     delete [] fTrackletContainer[0];
@@ -698,6 +700,8 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
   if(!TestBit(knewDM)){
     delete fDigitsManager;
     fDigitsManager = NULL;
+    delete fRawStream;
+    fRawStream = NULL;
   }
 
   AliInfo(Form("Number of found clusters : %d", fNoOfClusters)); 
@@ -795,7 +799,7 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
 
   fDet  = AliTRDgeometry::GetDetector(fLayer,istack,isector);
   if (fDet != det) {
-    AliError("Strange Detector number mismatch!");
+    AliError("Strange Detector number Missmatch!");
     return kFALSE;
   }
 
@@ -816,9 +820,11 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   fTimeTotal = fDigits->GetNtime();
 
   // Check consistency between OCDB and raw data
-  if (fTimeTotal != calibration->GetNumberOfTimeBinsDCS()) {
-    AliError(Form("Number of timebins does not match OCDB value (raw:%d, OCDB:%d)"
-                ,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()));
   }
 
   // Detector wise calibration object for the gain factors