Do not get main runloader from gAlice

[u/mrichter/AliRoot.git] / TOF / AliTOFTrigger.cxx

diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx
index cdd8719df0f5e446e3d73e5007f6fee62dce2f64..80de56b3593c538471c663b7861361c4ff56dacb 100644 (file)
--- a/TOF/AliTOFTrigger.cxx
+++ b/TOF/AliTOFTrigger.cxx
@@ -26,14 +26,18 @@
 //
 /////////////////////////////////////////////////////////////////////
 
-#include "AliTOFTrigger.h"
-#include "AliLog.h"
-#include "AliRun.h"
+#include <TClonesArray.h>
+
 #include "AliLoader.h"
+#include "AliLog.h"
 #include "AliRunLoader.h"
+#include "AliRun.h"
 #include "AliTriggerInput.h"
+
 #include "AliTOFdigit.h"
+#include "AliTOFTrigger.h"
 
+extern AliRun* gAlice;
 
 //-------------------------------------------------------------------------
 ClassImp(AliTOFTrigger)
@@ -67,18 +71,20 @@ ClassImp(AliTOFTrigger)
   CreateInputs();
 }
 //----------------------------------------------------------------------
-AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh, Int_t UPTh, Float_t deltaminpsi, Float_t deltamaxpsi, Float_t deltaminro, Float_t deltamaxro, Int_t stripWindow) : AliTriggerDetector() 
+AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh, Int_t UPTh, Float_t deltaminpsi, Float_t deltamaxpsi, Float_t deltaminro, Float_t deltamaxro, Int_t stripWindow) : 
+  AliTriggerDetector(),   
+  fHighMultTh(HighMultTh),
+  fppMBTh(ppMBTh),
+  fMultiMuonTh(MultiMuonTh),
+  fUPTh(UPTh),
+  fdeltaminpsi(deltaminpsi),
+  fdeltamaxpsi(deltamaxpsi),
+  fdeltaminro(deltaminro),
+  fdeltamaxro(deltamaxro),
+  fstripWindow(stripWindow)
+
 {
   //ctor with thresholds for triggers
-  fHighMultTh=HighMultTh;
-  fppMBTh=ppMBTh;
-  fMultiMuonTh=MultiMuonTh;
-  fUPTh=UPTh;
-  fdeltaminpsi = deltaminpsi;
-  fdeltamaxpsi = deltamaxpsi;
-  fdeltaminro = deltaminro;
-  fdeltamaxro = deltamaxro;
-  fstripWindow = stripWindow;
   for (Int_t i=0;i<kNLTM;i++){
     for (Int_t j=0;j<kNLTMchannels;j++){
       fLTMmatrix[i][j]=kFALSE;
@@ -96,18 +102,19 @@ AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh,
 
 //____________________________________________________________________________ 
 
-AliTOFTrigger::AliTOFTrigger(const AliTOFTrigger & tr):AliTriggerDetector()
+AliTOFTrigger::AliTOFTrigger(const AliTOFTrigger & tr):
+  AliTriggerDetector(tr),
+  fHighMultTh(tr.fHighMultTh),
+  fppMBTh(tr.fppMBTh),
+  fMultiMuonTh(tr.fMultiMuonTh),
+  fUPTh(tr.fUPTh),
+  fdeltaminpsi(tr.fdeltaminpsi),
+  fdeltamaxpsi(tr.fdeltamaxpsi),
+  fdeltaminro(tr.fdeltaminro),
+  fdeltamaxro(tr.fdeltamaxro),
+  fstripWindow(tr.fstripWindow)
 {
   //copy ctor
-  fHighMultTh=tr.fHighMultTh;
-  fppMBTh=tr.fppMBTh;
-  fMultiMuonTh=tr.fMultiMuonTh;
-  fUPTh=tr.fUPTh;
-  fdeltaminpsi = tr.fdeltaminpsi;
-  fdeltamaxpsi = tr.fdeltamaxpsi;
-  fdeltaminro = tr.fdeltaminro;
-  fdeltamaxro = tr.fdeltamaxro;
-  fstripWindow = tr.fstripWindow;
   for (Int_t i=0;i<kNLTM;i++){
     for (Int_t j=0;j<kNLTMchannels;j++){
       fLTMmatrix[i][j]=tr.fLTMmatrix[i][j];
@@ -132,12 +139,12 @@ void AliTOFTrigger::CreateInputs()
   // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast(new AliTriggerInput("TOF_Cosmic_MultiMuon_L0","Cosmic Multimuon Topology",0x01));
-   fInputs.AddLast(new AliTriggerInput("TOF_pp_MB_L0","pp Minimum Bias",0x02));
-   fInputs.AddLast(new AliTriggerInput("TOF_UltraPer_Coll_L0","Ultra Peripheral Collisions",0x04));
+   fInputs.AddLast(new AliTriggerInput("TOF_Cosmic_MultiMuon_L0","TOF",0));
+   fInputs.AddLast(new AliTriggerInput("TOF_pp_MB_L0","TOF",0));
+   fInputs.AddLast(new AliTriggerInput("TOF_UltraPer_Coll_L0","TOF",0));
 
-   fInputs.AddLast(new AliTriggerInput("TOF_High_Mult_L0","High Multiplicity",0x08));
-   fInputs.AddLast(new AliTriggerInput("TOF_Jet_L1","Jet Search",0x10));
+   fInputs.AddLast(new AliTriggerInput("TOF_High_Mult_L0","TOF",0));
+   fInputs.AddLast(new AliTriggerInput("TOF_Jet_L1","TOF",0));
 }
 
 //----------------------------------------------------------------------
@@ -369,7 +376,7 @@ void AliTOFTrigger::CreateLTMMatrix(){
     }
   }
   AliRunLoader *rl;
-  rl = gAlice->GetRunLoader();
+  rl = AliRunLoader::GetRunLoader();
   
   Int_t ncurrevent = rl->GetEventNumber();
   rl->GetEvent(ncurrevent);
@@ -412,8 +419,8 @@ void AliTOFTrigger::CreateLTMMatrix(){
     fLTMmatrix[indexLTM[0]][indexLTM[1]] = kTRUE;
   }
 
-  rl->UnloadDigits();
-  rl->UnloadgAlice();
+  tofLoader->UnloadDigits();
+//   rl->UnloadgAlice();
 }
 //-----------------------------------------------------------------------------
 void AliTOFTrigger::GetLTMIndex(Int_t *detind, Int_t *indexLTM){