Adding the structure for trigger rawdata reader (Christian)

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 88ff13fc703b9aeeb87d7755010fcf8d699410f9..cfe54e040d3b097c8eb4b208b4c2d4cf319341ec 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -84,7 +84,7 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
     printf("Event %d\n",ievent);
     runLoader->GetEvent(ievent);
 
-    //----------------------- digit2cluster & Digits2Trigger -------------------
+    //----------------------- digit2cluster & Trigger2Trigger -------------------
     if (!loader->TreeR()) loader->MakeRecPointsContainer();
      
     // tracking branch
@@ -153,27 +153,24 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
   AliMUONData* dataCluster = recoCluster->GetMUONData();
 
   AliMUONTriggerDecision* trigDec = new AliMUONTriggerDecision(loader,0,dataCluster);
-  //  AliMUONData* dataTrig = trigDec->GetMUONData();
-
-
+ 
   for (Int_t i = 0; i < 10; i++) {
     AliMUONClusterFinderVS *recModel = new AliMUONClusterFinderVS();
     recModel->SetGhostChi2Cut(10);
     recoCluster->SetReconstructionModel(i,recModel);
   } 
 
-  loader->LoadDigits("READ");
   loader->LoadRecPoints("RECREATE");
   loader->LoadTracks("RECREATE");
   
   //   Loop over events  
- Int_t iEvent = 0;
+  Int_t iEvent = 0;
             
- while (rawReader->NextEvent()) {
+  while (rawReader->NextEvent()) {
     printf("Event %d\n",iEvent);
     runLoader->GetEvent(iEvent++);
 
-    //----------------------- digit2cluster & Digits2Trigger -------------------
+    //----------------------- digit2cluster & Trigger2Trigger -------------------
     if (!loader->TreeR()) loader->MakeRecPointsContainer();
      
     // tracking branch
@@ -185,7 +182,7 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
     // trigger branch
     dataCluster->MakeBranch("TC");
     dataCluster->SetTreeAddress("TC");
-    trigDec->Trigger2Trigger(); 
+    trigDec->Trigger2Trigger(rawReader); 
     dataCluster->Fill("TC");
 
     loader->WriteRecPoints("OVERWRITE");
@@ -218,7 +215,6 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
     dataEvent->ResetRecTriggerTracks();
   
   }
-  loader->UnloadDigits();
   loader->UnloadRecPoints();
   loader->UnloadTracks();
 

diff --git a/MUON/AliMUONTriggerDecision.cxx b/MUON/AliMUONTriggerDecision.cxx
index 7901ec0e1c1a8315c426f9f8c1be76b6d190702f..fb29af618e42f9717f68ff639122ae85ab5c0430 100644 (file)
--- a/MUON/AliMUONTriggerDecision.cxx
+++ b/MUON/AliMUONTriggerDecision.cxx
@@ -28,6 +28,7 @@
 #include "AliRun.h"
 #include "AliRunLoader.h"
 #include "AliLoader.h"
+#include "AliRawReader.h" // for raw data
 
 
 //----------------------------------------------------------------------
@@ -1322,6 +1323,7 @@ void AliMUONTriggerDecision::PrintBitPatYInput(Int_t icirc){
   printf("\n");
   printf("===============================================================\n");
 }
+
 //----------------------------------------------------------------------
 void AliMUONTriggerDecision::PrintLocalOutput(Int_t minDevStrip[5], 
                                              Int_t minDev[5], 
@@ -1389,6 +1391,7 @@ void AliMUONTriggerDecision::GetGlobalTrigger(Int_t singlePlus[3],
     pairLike[i]    = fGlobalPairLike[i];    
   }
 }
+
 //_______________________________________________________________________
 void AliMUONTriggerDecision::Digits2Trigger(){
 // call the Trigger Algorithm and fill TreeD
@@ -1436,10 +1439,21 @@ void AliMUONTriggerDecision::Digits2Trigger(){
     }
   }
 }
+
 //_______________________________________________________________________
-void AliMUONTriggerDecision::Trigger2Trigger() {
+void AliMUONTriggerDecision::Trigger2Trigger() 
+{
 // copy trigger from TreeD to TreeR
 
   fMUONData->SetTreeAddress("GLT");
   fMUONData->GetTriggerD();
 }
+
+//_______________________________________________________________________
+void AliMUONTriggerDecision::Trigger2Trigger(AliRawReader* /*rawReader*/) 
+{
+// call the Trigger Algorithm from raw data and fill TreeR 
+
+   Fatal("Trigger2Trigger","Trigger not implemented for raw data input");
+
+}

diff --git a/MUON/AliMUONTriggerDecision.h b/MUON/AliMUONTriggerDecision.h
index 51fb92d36f067f0f0a78bd2b33711a56fc757b8c..e39abc2323455d6b2826a196e0dbb413705d8f44 100644 (file)
--- a/MUON/AliMUONTriggerDecision.h
+++ b/MUON/AliMUONTriggerDecision.h
@@ -18,6 +18,7 @@
 class AliLoader;
 class AliMUONData;
 class AliMUON;
+class AliRawReader;
 
 
 class AliMUONTriggerDecision : public TObject 
@@ -46,9 +47,11 @@ class AliMUONTriggerDecision : public TObject
                    Int_t &iTrigger);    
   void GlobalTrigger();
 
-  void Digits2Trigger(); // main function
+  void Digits2Trigger(); // main function for digitizer
 
-  void Trigger2Trigger();
+  void Trigger2Trigger();// main function for reconstructor
+
+  void Trigger2Trigger(AliRawReader* rawReader); // for raw data reader purpose
 
   void ClearDigits();
   TClonesArray* Digits(Int_t DetectionPlane);
@@ -71,10 +74,7 @@ class AliMUONTriggerDecision : public TObject
                        Int_t pairLike[3]) const;  
   
 
-// Add a new Local Trigger
-  // virtual void AddLocalTrigger(const AliMUONLocalTrigger);
-//  Return pointer to Local Triggers
-  //  TClonesArray* LocalTriggers(){return fLocalTriggers;}
+
 
   ClassDef(AliMUONTriggerDecision,1) // Trigger Decision class