avoid generator name string comparisons, change to int; avoid TLorentzVectors declara...

[u/mrichter/AliRoot.git] / PHOS / AliPHOSTriggerRawDigiProducer.cxx

diff --git a/PHOS/AliPHOSTriggerRawDigiProducer.cxx b/PHOS/AliPHOSTriggerRawDigiProducer.cxx
index bb50f2904b167a939f9a391a16ac89d748d64863..8f2e8cec9d16bcd37fd2f3e0da813f0e763bbbc8 100644 (file)
--- a/PHOS/AliPHOSTriggerRawDigiProducer.cxx
+++ b/PHOS/AliPHOSTriggerRawDigiProducer.cxx
@@ -104,7 +104,7 @@ void AliPHOSTriggerRawDigiProducer::ProcessEvent(TClonesArray* tdigits)
                  }
                }// end TimeBin loop
                
-               if( triggered && truReader->HasSignal() ){
+               if( triggered ){
                  // Get peak values
                  const int TSmax = Get4x4Max(fTriggerReader, fParameters, mod, TRURow, branch, xIdx, zIdx);
                  new((*tdigits)[iDigit]) AliPHOSTriggerRawDigit(mod,xIdx,zIdx,TRURow,branch,TSmax); 
@@ -141,13 +141,12 @@ int AliPHOSTriggerRawDigiProducer::Get2x2Signal(AliPHOSTriggerRawReader* reader,
   const int TRUX = xIdx % kN2x2XPrTRURow; // 2x2 coordinates
   const int TRUZ = zIdx % kN2x2ZPrBranch; // 2x2 coordinates
 
-  AliPHOSTRURawReader* truReader = reader->GetTRU(mod, TRURow, branch);
-  if( truReader->IsActive(timeBin) && truReader->HasSignal(timeBin)  ){
+  if( reader->GetTRU(mod, TRURow, branch)->IsActive() ){
     const int signal = reader->GetTRU(mod, TRURow, branch)->GetTriggerSignal( TRUX, TRUZ, timeBin);
     if( parameters )
       return signal - parameters->GetTRUPedestal(mod, TRURow, branch, TRUX, TRUZ);
     else
-      return signal - AliPHOSTRURawReader::kDefaultSignalValue;
+      return signal - AliPHOSTRURawReader::GetDefaultSignalValue();
   }
   else
     return 0;