remove LoOutput (Philippe)

diff --git a/MUON/AliMUONLocalTrigger.cxx b/MUON/AliMUONLocalTrigger.cxx
index 7b0e752e6a421ab5c2fede4cb484c72e780236ec..1957c47166baac06ebcca435a80b6b1f0dcf880c 100644 (file)
--- a/MUON/AliMUONLocalTrigger.cxx
+++ b/MUON/AliMUONLocalTrigger.cxx
@@ -39,7 +39,6 @@ AliMUONLocalTrigger::AliMUONLocalTrigger()
     fLoStripY(0),
     fLoLpt(0),
     fLoHpt(0),
-    fLoOutput(0),
     
     fX1Pattern(0),
     fX2Pattern(0),
@@ -64,7 +63,6 @@ AliMUONLocalTrigger::AliMUONLocalTrigger(const AliMUONLocalTrigger& theMUONLocal
       fLoStripY(theMUONLocalTrig.fLoStripY),
       fLoLpt(theMUONLocalTrig.fLoLpt),
       fLoHpt(theMUONLocalTrig.fLoHpt),
-      fLoOutput(theMUONLocalTrig.fLoOutput),
       
       fX1Pattern(theMUONLocalTrig.fX1Pattern),
       fX2Pattern(theMUONLocalTrig.fX2Pattern),
@@ -99,7 +97,6 @@ AliMUONLocalTrigger& AliMUONLocalTrigger::operator=(const AliMUONLocalTrigger& t
   fLoStripY  = theMUONLocalTrig.fLoStripY;           
   fLoLpt     = theMUONLocalTrig.fLoLpt;
   fLoHpt     = theMUONLocalTrig.fLoHpt;
-  fLoOutput  = theMUONLocalTrig.fLoOutput;
 
   fX1Pattern  = theMUONLocalTrig.fX1Pattern;
   fX2Pattern  = theMUONLocalTrig.fX2Pattern;

diff --git a/MUON/AliMUONLocalTrigger.h b/MUON/AliMUONLocalTrigger.h
index 3ba65376202910ab80867ba94fe3ed4395fa2e59..7cd2eb74f5991302e1fe2368da23562fd7e5c68d 100644 (file)
--- a/MUON/AliMUONLocalTrigger.h
+++ b/MUON/AliMUONLocalTrigger.h
@@ -37,9 +37,7 @@ class AliMUONLocalTrigger : public TObject {
   Int_t LoLpt() const {return fLoLpt;}
         /// Return High p
   Int_t LoHpt() const {return fLoHpt;}
-        /// Return trigger output 
-  Int_t LoOutput() const {return fLoOutput;}  
-  
+
            /// Return X strip pattern for chamber 11
   UShort_t GetX1Pattern() const {return fX1Pattern;}
            /// Return X strip pattern for chamber 12  
@@ -74,8 +72,6 @@ class AliMUONLocalTrigger : public TObject {
   void SetLoLpt(Int_t loLpt)     {fLoLpt = loLpt;}
            /// Set High pt
   void SetLoHpt(Int_t loHpt)     {fLoHpt = loHpt;}
-           /// Set trigger output 
-  void SetLoOutput(Int_t loOutput) {fLoOutput = loOutput;}  
    
            /// Set X strip pattern for chamber 11
   void SetX1Pattern(UShort_t pat) {fX1Pattern = pat;}
@@ -107,7 +103,6 @@ private:
   Int_t fLoStripY;  ///< Y strip in MT11 
   Int_t fLoLpt;     ///< Low pt  0 : nothing, 1 : Minus, 2 : Plus, 3 : Undef
   Int_t fLoHpt;     ///< High pt 0 : nothing, 1 : Minus, 2 : Plus, 3 : Undef
-  Int_t fLoOutput;  ///< board output 0 : not fired, 1 fired
   
   UShort_t fX1Pattern; ///< X strip pattern for chamber 11
   UShort_t fX2Pattern; ///< X strip pattern for chamber 12

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index 81cac01994295ecf22d5322c3651e9525bbd7826..8714a85651e4cbe795e65e67abe1468fd983ee6c 100644 (file)
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -587,7 +587,6 @@ void AliMUONTriggerElectronics::Digits2Trigger()
            fLocalTrigger->SetLoStripX(board->GetStripX11());
            fLocalTrigger->SetLoDev(board->GetDev());
            fLocalTrigger->SetLoStripY(board->GetStripY11());
-           fLocalTrigger->SetLoOutput(board->Triggered());
           
            //             SAVE LUT OUTPUT 
            UShort_t response = board->GetResponse();

diff --git a/MUON/MUONCheck.C b/MUON/MUONCheck.C
index 8622f45ad1e8a594ebb18718f4722a1963217879..d6210c0db1e581e7b338bb1b57f0de14a4d007c8 100644 (file)
--- a/MUON/MUONCheck.C
+++ b/MUON/MUONCheck.C
@@ -530,14 +530,14 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
     for (Int_t ilocal=0; ilocal<nlocals; ilocal++) { // Local Trigger
       locTrg = static_cast<AliMUONLocalTrigger*>(localTrigger->At(ilocal));
 
-      if (locTrg->LoOutput()) { // board is fired
+      if (locTrg->LoLpt()!=0) { // board is fired
 
       if (PRINTOUT) locTrg->Print("full");
       
       AliMUONTriggerCircuit* circuit = (AliMUONTriggerCircuit*)triggerCircuit->At(locTrg->LoCircuit()-1); 
       
       TgtupleLoc->Fill(ievent,locTrg->LoCircuit(),locTrg->LoStripX(),locTrg->LoDev(),locTrg->LoStripY(),locTrg->LoLpt(),locTrg->LoHpt(),circuit->GetY11Pos(locTrg->LoStripX()),circuit->GetY21Pos(locTrg->LoStripX()+locTrg->LoDev()+1),circuit->GetX11Pos(locTrg->LoStripY()));
-      }
+    } // board is fired
       
     } // end of loop on Local Trigger
 
@@ -578,15 +578,18 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
       myFile->Close();
   }
 
-  MUONLoader->UnloadRecPoints();
-
+  if (!readFromRP) {
+      MUONLoader->UnloadDigits();  
+  } else {    
+      MUONLoader->UnloadRecPoints();
+  }
+  
   delete crateManager;
   delete transformer;
   delete triggerCircuit;
   
 }
 
-
 void MUONrectracks (Int_t event2Check=0, char * filename="galice.root"){
 // reads and dumps trigger objects from MUON.RecPoints.root
   TClonesArray * RecTracks;