- fix for consistent treatment of zero-suppression threshold in simulation and hardware

diff --git a/TRD/AliTRDmcmSim.cxx b/TRD/AliTRDmcmSim.cxx
index 162a623eafe3b0e16b10165acb80a125299a73dc..d6536c4ac4f94ec3172d54befc1dd1f09e04827d 100644 (file)
--- a/TRD/AliTRDmcmSim.cxx
+++ b/TRD/AliTRDmcmSim.cxx
@@ -1115,9 +1115,9 @@ void AliTRDmcmSim::ZSMapping()
     // ----- first channel -----
     iAdc = 0;
 
-    ap = 0;               // previous
-    ac = adc[iAdc  ][it]; // current
-    an = adc[iAdc+1][it]; // next
+    ap = 0 >> fgkAddDigits;               // previous
+    ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+    an = adc[iAdc+1][it] >> fgkAddDigits; // next
 
     mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
     mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster
@@ -1133,9 +1133,9 @@ void AliTRDmcmSim::ZSMapping()
     // ----- last channel -----
     iAdc = AliTRDfeeParam::GetNadcMcm() - 1;
 
-    ap = adc[iAdc-1][it]; // previous
-    ac = adc[iAdc  ][it]; // current
-    an = 0;               // next
+    ap = adc[iAdc-1][it] >> fgkAddDigits; // previous
+    ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+    an = 0 >> fgkAddDigits;               // next
 
     mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
     mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster
@@ -1150,9 +1150,9 @@ void AliTRDmcmSim::ZSMapping()
 
     // ----- middle channels -----
     for( iAdc = 1 ; iAdc < AliTRDfeeParam::GetNadcMcm()-1; iAdc++ ) {
-      ap = adc[iAdc-1][it]; // previous
-      ac = adc[iAdc  ][it]; // current
-      an = adc[iAdc+1][it]; // next
+      ap = adc[iAdc-1][it] >> fgkAddDigits; // previous
+      ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+      an = adc[iAdc+1][it] >> fgkAddDigits; // next
 
       mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
       mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster

diff --git a/TRD/AliTRDtrapConfigHandler.cxx b/TRD/AliTRDtrapConfigHandler.cxx
index d57cc4eb182f05c91ad87563bb12b747988c8369..4d557dd06422070c3a0280147880a138dd01b68a 100644 (file)
--- a/TRD/AliTRDtrapConfigHandler.cxx
+++ b/TRD/AliTRDtrapConfigHandler.cxx
@@ -207,8 +207,8 @@ Int_t AliTRDtrapConfigHandler::LoadConfig()
     fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBSF, 1, iDet);  // 0: store filtered; 1: store unfiltered
 
     // zs applied to data stored in event buffer (sel. by EBSF)
-    fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIS, 15 << 2, iDet); // single indicator threshold (plus two digits)
-    fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIT, 30 << 2, iDet); // sum indicator threshold (plus two digits)
+    fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIS, 15, iDet); // single indicator threshold (plus two digits)
+    fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIT, 30, iDet); // sum indicator threshold (plus two digits)
     fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIL, 0xf0, iDet);   // lookup table
     fTrapConfig->SetTrapReg(AliTRDtrapConfig::kEBIN, 0, iDet);      // neighbour sensitivity