fix to comply with new root version

[u/mrichter/AliRoot.git] / VZERO / AliVZEROTrigger.cxx

diff --git a/VZERO/AliVZEROTrigger.cxx b/VZERO/AliVZEROTrigger.cxx
index 33dfbd1649998b7ad0c9f5e0549effccb39c189c..31a95219b480cb30ca3cbf78356dd0bf6104d318 100644 (file)
--- a/VZERO/AliVZEROTrigger.cxx
+++ b/VZERO/AliVZEROTrigger.cxx
@@ -50,6 +50,7 @@ void AliVZEROTrigger::Trigger()
 
   loader->LoadDigits("READ");
   TTree* vzeroDigitsTree = loader->TreeD();
+  if (!vzeroDigitsTree) return;
 
   TClonesArray* vzeroDigits = new TClonesArray("AliVZEROdigit",1000);
   TBranch* digitBranch = vzeroDigitsTree->GetBranch("VZERODigit");
@@ -71,18 +72,18 @@ void AliVZEROTrigger::Trigger()
     Int_t nDigits = vzeroDigits->GetEntriesFast();
     
     for (Int_t d=0; d<nDigits; d++) {
-      vzeroDigitsTree->GetEvent(d);
+      //      vzeroDigitsTree->GetEvent(d);
       AliVZEROdigit* digit = (AliVZEROdigit*)vzeroDigits->At(d);
       
-      Int_t   cellNumber = digit->CellNumber();
+      Int_t   PMNumber   = digit->PMNumber();
       Float_t adc        = digit->ADC();
       Float_t tdc        = digit->Time(); // in 100 of picoseconds
       
-      if (cellNumber<=47 && adc>fAdcThresHold) {
+      if (PMNumber<=31 && adc>fAdcThresHold) {
        nLeftDig++;
        if (tdc<firstTimeLeft) firstTimeLeft = tdc;
       }        
-      if (cellNumber>=48 && adc>fAdcThresHold) {
+      if (PMNumber>=32 && adc>fAdcThresHold) {
        nRightDig++;
        if (tdc<firstTimeRight) firstTimeRight = tdc;
       }
@@ -112,7 +113,7 @@ void AliVZEROTrigger::Trigger()
     }
   }
   
-  AliDebug(1,Form("VZERO cells fired: %d (left) %d (right)", nLeftDig, nRightDig));
+  AliDebug(1,Form("VZERO PMs fired: %d (left) %d (right)", nLeftDig, nRightDig));
 
   return;
 }