More info in error mesaage, more print in AliTrigger*Scaler*

diff --git a/STEER/ESD/AliTriggerScalersRecordESD.cxx b/STEER/ESD/AliTriggerScalersRecordESD.cxx
index 5dead568a0c991cbc7560dd6ebef91b9e7e963b1..3d093991ba91ad7e9a4e18a8298c65c69641c5bb 100644 (file)
--- a/STEER/ESD/AliTriggerScalersRecordESD.cxx
+++ b/STEER/ESD/AliTriggerScalersRecordESD.cxx
@@ -103,6 +103,7 @@ void AliTriggerScalersRecordESD::Print( const Option_t* ) const
 {\r
    // Print\r
   cout << "Trigger Scalers Record, time group: "<< fTimeGroup << endl;\r
+  fTimestamp.Print();\r
   for( Int_t i=0; i<fScalers.GetEntriesFast(); ++i ) \r
      ((AliTriggerScalersESD*)fScalers.At(i))->Print();\r
 }\r

diff --git a/STEER/STEER/AliTriggerRunScalers.cxx b/STEER/STEER/AliTriggerRunScalers.cxx
index ce6ce8734684dc689f0440534f94f4b15c2b2e2c..488ab23e0d866d4934c5539e9be6354e085c25f5 100644 (file)
--- a/STEER/STEER/AliTriggerRunScalers.cxx
+++ b/STEER/STEER/AliTriggerRunScalers.cxx
@@ -320,7 +320,7 @@ Int_t AliTriggerRunScalers::ConsistencyCheck(Int_t position,Bool_t correctOverfl
    AliTriggerScalersRecord* scalers2 = (AliTriggerScalersRecord*)fScalersRecord.At(position);
    AliTriggerScalersRecord* scalers1 = (AliTriggerScalersRecord*)fScalersRecord.At(position-1);
    if (scalers2->Compare((AliTriggerScalersRecord*)fScalersRecord.At(position-1)) == -1) return 1;
-   
+
    AliTriggerScalersRecordESD* recESD = 0;
    if(correctOverflow){
      recESD = new AliTriggerScalersRecordESD();
@@ -342,16 +342,32 @@ Int_t AliTriggerRunScalers::ConsistencyCheck(Int_t position,Bool_t correctOverfl
       for(Int_t i=0;i<5;i++){
          if ((c2[i] - c1[i]) < (c2[i+1] - c1[i+1]) && increase[i] && increase[i+1] ) {
                  if ( ((c2[i+1] - c1[i+1]) - (c2[i] - c1[i])) < 16 ) {AliWarningClass("Trigger scaler Level[i+1] > Level[i]. Diff < 16!");}
-                 else return 3; }
+                 else {
+                   cout << " 1 pos= " << position << "i= "<< i << endl;
+                   return 3; 
+                }
+        }
          else if ( (max1 - c1[i]+c2[i]) < (c2[i+1] - c1[i+1]) && overflow[i][ic] && increase[i+1] ) {
                  if ( ((c2[i+1] - c1[i+1]) - (max1 - c1[i]+c2[i])) < 16 ) {AliWarningClass("Trigger scaler Level[i+1] > Level[i]. Diff < 16!");}
-                 else return 3; }
+                 else{
+                   cout << " 2 pos= " << position << "i= "<< i << endl;
+                   return 3; 
+                }
+        }
          else if ( (c2[i] - c1[i]) < (max1 - c1[i+1] + c2[i+1]) && increase[i] && overflow[i+1][ic] ) {
                  if ( ((max1 - c1[i+1] + c2[i+1]) - (c2[i] - c1[i])) < 16 ) {AliWarningClass("Trigger scaler Level[i+1] > Level[i]. Diff < 16!");}
-                 else return 3; }
+                 else{
+                   cout << " 3 pos= " << position << "i= "<< i << endl;
+                   return 3; 
+                   }
+        }
          else if ( (max1 - c1[i] + c2[i] ) < (max1 - c1[i+1] + c2[i+1]) && overflow[i][ic] && overflow[i+1][ic] ) {
                  if ( ((max1 - c1[i+1] + c2[i+1]) - (max1 - c1[i] + c2[i] )) < 16 ) {AliWarningClass("Trigger scaler Level[i+1] > Level[i]. Diff < 16!");}
-                 else return 3; }
+                 else{
+                   cout << " 4 pos= " << position << "i= "<< i << endl;
+                   return 3;
+                   }
+       }
       }
       if(correctOverflow){ 
         for(Int_t i=0;i<6;i++){ c64[i]=c2[i]+max1*overflow[i][ic]; }

diff --git a/STEER/STEERBase/AliTriggerScalersRecord.cxx b/STEER/STEERBase/AliTriggerScalersRecord.cxx
index d4f0fe49ef367cd7830b0db25d70c74796965b3d..b76bef3d96da6233103e903ff5720ad81447682e 100644 (file)
--- a/STEER/STEERBase/AliTriggerScalersRecord.cxx
+++ b/STEER/STEERBase/AliTriggerScalersRecord.cxx
@@ -124,7 +124,7 @@ AliTriggerScalers* AliTriggerScalersRecord::GetTriggerScalersForClassBinary( con
 void AliTriggerScalersRecord::Print( const Option_t* ) const
 {
    // Print
-  cout << "Trigger Scalers Record: " << endl;
+  cout << "Trigger Scalers Record, time group: "<< fTimeGroup << endl;
   fTimestamp.Print();
   for( Int_t i=0; i<fScalers.GetEntriesFast(); ++i ) 
      ((AliTriggerScalers*)fScalers.At(i))->Print();