changes in the MagF constructor

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

diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx
index 91626e09b59160a820b7ad160a8743cc9a8fd81c..426e1c439f89a31ffa9e71d9d455722af2fabb35 100644 (file)
--- a/TOF/AliTOFTrigger.cxx
+++ b/TOF/AliTOFTrigger.cxx
@@ -103,27 +103,18 @@ AliTOFTrigger::AliTOFTrigger(Int_t HighMultTh, Int_t ppMBTh, Int_t MultiMuonTh,
 //____________________________________________________________________________ 
 
 AliTOFTrigger::AliTOFTrigger(const AliTOFTrigger & tr):
-  AliTriggerDetector(),
-  fHighMultTh(0),
-  fppMBTh(0),
-  fMultiMuonTh(0),
-  fUPTh(0),
-  fdeltaminpsi(0),
-  fdeltamaxpsi(0),
-  fdeltaminro(0),
-  fdeltamaxro(0),
-  fstripWindow(0)
+  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];
@@ -149,16 +140,17 @@ void AliTOFTrigger::CreateInputs()
    if( fInputs.GetEntriesFast() > 0 ) return;
    
    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("0OIN","TOF",0)); // was "TOF_pp_MB_L0"
+   fInputs.AddLast(new AliTriggerInput("0OX1","TOF",0)); // was "TOF_UltraPer_Coll_L0"
 
-   fInputs.AddLast(new AliTriggerInput("TOF_High_Mult_L0","TOF",0));
+   fInputs.AddLast(new AliTriggerInput("0OHM","TOF",0)); // was "TOF_High_Mult_L0"
    fInputs.AddLast(new AliTriggerInput("TOF_Jet_L1","TOF",0));
 }
 
 //----------------------------------------------------------------------
 void AliTOFTrigger::Trigger(){
   //triggering method
+
   CreateLTMMatrix();
   Int_t nchonFront = 0;
   Int_t nchonBack = 0;
@@ -195,12 +187,12 @@ void AliTOFTrigger::Trigger(){
 
   //pp Minimum Bias Trigger
   if (nchonTot >= fppMBTh) {
-    SetInput("TOF_pp_MB_L0");
+    SetInput("0OIN");
   }
 
   //High Multiplicity Trigger
   if (nchonTot >= fHighMultTh) {
-    SetInput("TOF_High_Mult_L0");
+    SetInput("0OHM");
   }
 
   
@@ -314,7 +306,7 @@ void AliTOFTrigger::Trigger(){
          for (Int_t i2=minipsi;i2<=maxipsi;i2++){
            for (Int_t j2 = j2min;j2<=j2max;j2++){
              if (fCTTMmatrixFront[i2][j2]) {
-               SetInput("TOF_UltraPer_Coll_L0");
+               SetInput("0OX1");
                boolpsi = kTRUE;
                //exiting loops
                j2 = j2max+1;
@@ -328,7 +320,7 @@ void AliTOFTrigger::Trigger(){
            for (Int_t i2=miniro;i2<=maxiro;i2++){
              for (Int_t j2 = j2min;j2<=j2max;j2++){
                if (fCTTMmatrixFront[i2][j2]) {
-                 SetInput("TOF_UltraPer_Coll_L0");
+                 SetInput("0OX1");
                  boolro = kTRUE;
                  //exiting loops
                  j2 = j2max+1;
@@ -345,7 +337,7 @@ void AliTOFTrigger::Trigger(){
          for (Int_t i2=minipsi;i2<=maxipsi;i2++){
            for (Int_t j2 = j2min;j2<=j2max;j2++){
              if (fCTTMmatrixBack[i2][j2]) {
-               SetInput("TOF_UltraPer_Coll_L0");
+               SetInput("0OX1");
                boolpsi = kTRUE;
                //exiting loops
                j2 = j2max+1;
@@ -359,7 +351,7 @@ void AliTOFTrigger::Trigger(){
            for (Int_t i2=miniro;i2<=maxiro;i2++){
              for (Int_t j2 = j2min;j2<=j2max;j2++){
                if (fCTTMmatrixBack[i2][j2]) {
-                 SetInput("TOF_UltraPer_Coll_L0");
+                 SetInput("0OX1");
                  boolro = kTRUE;
                  //exiting loops
                  j2 = j2max+1;
@@ -385,7 +377,7 @@ void AliTOFTrigger::CreateLTMMatrix(){
     }
   }
   AliRunLoader *rl;
-  rl = gAlice->GetRunLoader();
+  rl = AliRunLoader::Instance();
   
   Int_t ncurrevent = rl->GetEventNumber();
   rl->GetEvent(ncurrevent);