- updated AliRoot and ROOT version to be used on the GRID (Camilla)

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

diff --git a/PHOS/AliPHOSTrigger.cxx b/PHOS/AliPHOSTrigger.cxx
index f085d54a810659401cd426210a7104ff3b3f2382..ec2fb3b06f3bffdfac8031e085bd910bf62df956 100644 (file)
--- a/PHOS/AliPHOSTrigger.cxx
+++ b/PHOS/AliPHOSTrigger.cxx
@@ -159,7 +159,7 @@ void AliPHOSTrigger::CreateInputs()
 
    TString name = GetName();
    
-   fInputs.AddLast( new AliTriggerInput( "PHOS_L0",       name, 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "0PH0",       name, 0 ) );
    fInputs.AddLast( new AliTriggerInput( "PHOS_JetHPt_L1",name, 1 ) );
    fInputs.AddLast( new AliTriggerInput( "PHOS_JetMPt_L1",name, 1 ) );
    fInputs.AddLast( new AliTriggerInput( "PHOS_JetLPt_L1",name, 1 ) );
@@ -340,7 +340,7 @@ Bool_t AliPHOSTrigger::IsPatchIsolated(Int_t iPatchType, const Int_t imod, const
 
   AliDebug(2,Form("Type %d, Maximum amplitude %f, patch+isol square %f",iPatchType, maxamp, amp));
 
-  if(TMath::Nint(amp*1E5) < TMath::Nint(maxamp*1E5)){
+  if(amp < maxamp){
     AliError(Form("Bad sum: Type %d, Maximum amplitude %f, patch+isol square %f",iPatchType, maxamp, amp));
     return kFALSE;
   }
@@ -501,7 +501,7 @@ void AliPHOSTrigger::Print(const Option_t * opt) const
          fL0Threshold) ;  
   
   printf( "             Threshold for LO %10.2f\n", fL0Threshold) ;  
-  in = (AliTriggerInput*)fInputs.FindObject( "PHOS_L0" );
+  in = (AliTriggerInput*)fInputs.FindObject( "0PH0" );
   if(in->GetValue())
     printf( "             *** PHOS LO is set ***\n") ; 
   
@@ -593,7 +593,7 @@ void AliPHOSTrigger::SetTriggers(const Int_t iMod, const TMatrixD & ampmax2, con
     //Set L0
     for(Int_t i = 0 ; i < nTimeBins ; i++){
       if(fADCValuesHigh2x2[i] >= fL0Threshold || fADCValuesLow2x2[i] >= fL0Threshold) {
-       SetInput("PHOS_L0") ;
+       SetInput("0PH0") ;
        break;
       }
     }