Updates needed to make the trigger inputs compatible with the new constructors. The...
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 22 Nov 2007 11:48:04 +0000 (11:48 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 22 Nov 2007 11:48:04 +0000 (11:48 +0000)
ACORDE/AliACORDETrigger.cxx
EMCAL/AliEMCALTrigger.cxx
ITS/AliITSTrigger.cxx
MUON/AliMUONTrigger.cxx
PHOS/AliPHOSTrigger.cxx
T0/AliT0Trigger.cxx
TOF/AliTOFTrigger.cxx
TRD/AliTRDTriggerL1.cxx
VZERO/AliVZEROTrigger.cxx
ZDC/AliZDCTrigger.cxx

index bfd77dd255f616daa57552ef0d4588d5d28ecce6..6a2c3e33c8b80d09f49c67466504361389833437 100644 (file)
@@ -44,10 +44,10 @@ void AliACORDETrigger::CreateInputs()
   // two acorde triggers, single muon and multicoincidence
   fInputs.AddLast( new 
                   AliTriggerInput( "ACORDE_SINGLE", 
-                                   "At least one digit in ACORDE", 0x01 ) );
+                                   "ACORDE", 0 ) );
   fInputs.AddLast( new 
                   AliTriggerInput( "ACORDE_MULTI",
-                                   "At least M digits in ACORDE", 0x02 ) );
+                                   "ACORDE", 0 ) );
 }
 
 void AliACORDETrigger::Trigger()
index 4877e9e69592a60a7b915495ae265f89aaeb006b..c61bc5ede9208713aec22402aff0380411aa0c53 100644 (file)
@@ -139,10 +139,10 @@ void AliEMCALTrigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast( new AliTriggerInput( "EMCAL_L0",       "EMCAL L0", 0x02 ) );
-   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetHPt_L1","EMCAL Jet High Pt L1",   0x04 ) );
-   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetMPt_L1","EMCAL Jet Medium Pt L1", 0x08 ) );
-   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetLPt_L1","EMCAL Jet Low Pt L1",    0x016 ) );
+   fInputs.AddLast( new AliTriggerInput( "EMCAL_L0",       "EMCAL", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetHPt_L1","EMCAL", 1 ) );
+   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetMPt_L1","EMCAL", 1 ) );
+   fInputs.AddLast( new AliTriggerInput( "EMCAL_JetLPt_L1","EMCAL", 1 ) );
  
 }
 
index 7882a56cfd1c69dc171553a1fd8368f2aa9bc411..423d2248e9e40d5bfa0ca16470886671a5452ff9 100644 (file)
@@ -52,7 +52,6 @@ fHighMultFOThreshold(190){
 
   //standard constructor
   SetName("ITS");
-  CreateInputs();
 
   // set parameters to define trigger condition thresholds
   //fGlobalFOThreshold = 1;
@@ -67,8 +66,8 @@ void AliITSTrigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast( new AliTriggerInput( "ITS_SPD_GFO_L0",     "Global, Fast OR all detectors", 0x01 ) );
-   fInputs.AddLast( new AliTriggerInput( "ITS_SPD_HMULT_L0",   "High Multiplicity",             0x02 ) );
+   fInputs.AddLast( new AliTriggerInput( "SPD_GFO_L0",     "SPD", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "SPD_HMULT_L0",   "SPD", 0 ) );
 
 }
 
@@ -150,10 +149,10 @@ void AliITSTrigger::MultiplicityTriggers(TObjArray* digDet, TTree* treeD, AliITS
 
   // produce input trigger condition
   if (totalNumberOfFO>=fGlobalFOThreshold) 
-    SetInput( "ITS_SPD_GFO_L0" );
+    SetInput( "SPD_GFO_L0" );
 
   if (totalNumberOfFOLay1>=fHighMultFOThreshold) 
-    SetInput( "ITS_SPD_HMULT_L0" );
+    SetInput( "SPD_HMULT_L0" );
 
   return;
 
index eebbf9d1d169350375663881f1f91ee6cae69398..e23466cc6e9e6eee56d49e2f5c2adf3f3d549982 100644 (file)
@@ -67,14 +67,14 @@ void AliMUONTrigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast( new AliTriggerInput( "MUON_Single_LPt_L0", "Single Low Pt",  0x01 ) );
-   fInputs.AddLast( new AliTriggerInput( "MUON_Single_HPt_L0", "Single High Pt", 0x02 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Single_LPt_L0", "MUONTRG",  0 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Single_HPt_L0", "MUONTRG", 0 ) );
 
-   fInputs.AddLast( new AliTriggerInput( "MUON_Unlike_LPt_L0", "Dimuon Unlike Sign pair Low Pt",  0x04 ) );
-   fInputs.AddLast( new AliTriggerInput( "MUON_Unlike_HPt_L0", "Dimuon Unlike Sign pair High Pt", 0x08 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Unlike_LPt_L0", "MUONTRG",  0 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Unlike_HPt_L0", "MUONTRG", 0 ) );
 
-   fInputs.AddLast( new AliTriggerInput( "MUON_Like_LPt_L0", "Dimuon Like Sign pair Low Pt",  0x10 ) );
-   fInputs.AddLast( new AliTriggerInput( "MUON_Like_HPt_L0", "Dimuon Like Sign pair High Pt", 0x20 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Like_LPt_L0", "MUONTRG",  0 ) );
+   fInputs.AddLast( new AliTriggerInput( "MUON_Like_HPt_L0", "MUONTRG", 0 ) );
 }
 
 //----------------------------------------------------------------------
index 5e5d5395d32fea9a600352583ef069d449db7da0..85487564ef5e4e06e8bcdb6125dc0c788d306034 100644 (file)
@@ -145,11 +145,13 @@ void AliPHOSTrigger::CreateInputs()
    
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
+
+   TString name = GetName();
    
-   fInputs.AddLast( new AliTriggerInput( "PHOS_L0",       "PHOS L0", 0x02 ) );
-   fInputs.AddLast( new AliTriggerInput( "PHOS_JetHPt_L1","PHOS Jet High Pt L1", 0x04 ) );
-   fInputs.AddLast( new AliTriggerInput( "PHOS_JetMPt_L1","PHOS Jet Medium Pt L1", 0x08 ) );
-   fInputs.AddLast( new AliTriggerInput( "PHOS_JetLPt_L1","PHOS Jet Low Pt L1", 0x016 ) );
+   fInputs.AddLast( new AliTriggerInput( "PHOS_L0",       name, 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "PHOS_JetHPt_L1",name, 1 ) );
+   fInputs.AddLast( new AliTriggerInput( "PHOS_JetMPt_L1",name, 1 ) );
+   fInputs.AddLast( new AliTriggerInput( "PHOS_JetLPt_L1",name, 1 ) );
  
 }
 
index 4c30bdc3006621a753673c3cd761767815969110..23bdfd067ad66d9fe14d8a394623b6012a0a9254 100644 (file)
@@ -47,11 +47,11 @@ void AliT0Trigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast( new AliTriggerInput( "START_A_L0", "Signal on T0-A",  0x0100 ) );
-   fInputs.AddLast( new AliTriggerInput( "START_C_L0", "Signal on T0-C", 0x0200 ) );
-   fInputs.AddLast( new AliTriggerInput( "START_Vertex_L0", " Vertex T0-C&T0-A ", 0x0400 ) );
-   fInputs.AddLast( new AliTriggerInput( "START_Centr_L0", "Centrality central",  0x0800 ) );
-   fInputs.AddLast( new AliTriggerInput( "START_SemiCentral_L0", "Centrality semicentral",  0x1000 ) );
+   fInputs.AddLast( new AliTriggerInput( "T0_A_L0", "T0",  0 ) );
+   fInputs.AddLast( new AliTriggerInput( "T0_C_L0", "T0", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "T0_Vertex_L0", "T0", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "T0_Centr_L0", "T0",  0 ) );
+   fInputs.AddLast( new AliTriggerInput( "T0_SemiCentral_L0", "T0",  0 ) );
 }
 
 //----------------------------------------------------------------------
@@ -83,12 +83,12 @@ void AliT0Trigger::Trigger()
   Int_t   timeDiff = fDigits->TimeDiff();
   Int_t    sumMult=   fDigits->SumMult();
 
-  if (besttimeA > 0 && besttimeA <99999  )  SetInput("START_A_L0");
-  if (besttimeC>0  && besttimeC<99999)   SetInput("START_C_L0"); 
+  if (besttimeA > 0 && besttimeA <99999  )  SetInput("T0_A_L0");
+  if (besttimeC>0  && besttimeC<99999)   SetInput("T0_C_L0"); 
   //6093 corrsponds to vertex -20cm, 6202 vertex +20 with delay 150nc eqalized on the TVDC unit 
-  if (timeDiff >6090 && timeDiff < 6210)       SetInput("START_Vertex_L0");
-  if (sumMult > 175)                           SetInput("START_Centr_L0");
-  if (sumMult>155 && sumMult <= 175)           SetInput("START_SemiCentral_L0");;
+  if (timeDiff >6090 && timeDiff < 6210)       SetInput("T0_Vertex_L0");
+  if (sumMult > 175)                           SetInput("T0_Centr_L0");
+  if (sumMult>155 && sumMult <= 175)           SetInput("T0_SemiCentral_L0");;
 
    
 }
index a4701fb42489b6dfd969b4b1dca0d59f0f61941a..91626e09b59160a820b7ad160a8743cc9a8fd81c 100644 (file)
@@ -148,12 +148,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));
 }
 
 //----------------------------------------------------------------------
index 5b72aa992756d078875bbd55ee4a81cb3a8a0add..b25a0f78e80a5a93da0201cbf479c288c7bf7a86 100644 (file)
@@ -57,26 +57,26 @@ void AliTRDTriggerL1::CreateInputs()
   //
 
   fInputs.AddLast(new AliTriggerInput("TRD_Unlike_EPair_L1"
-                                     ,"Unlike electron pair"
-                                     ,0x01 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_Like_EPair_L1"
-                                     ,"Like electron pair"
-                                     ,0x02 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_Jet_LPt_L1"
-                                     ,"Jet low pt"
-                                     ,0x04 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_Jet_HPt_L1"
-                                     ,"Jet high pt"
-                                     ,0x08 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_Electron_L1"
-                                     ,"Single electron"
-                                     ,0x10 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_HadrLPt_L1"
-                                     ,"Single hadron low pt "
-                                     ,0x20 ));
+                                     ,"TRD"
+                                     ,1 ));
   fInputs.AddLast(new AliTriggerInput("TRD_HadrHPt_L1"
-                                     ,"Single hadron high pt"
-                                     ,0x40 ));
+                                     ,"TRD"
+                                     ,1 ));
 
 }
 
index 75087d5cbeff4c3f5fce4c1d4bfbc07a7a735aa7..98c4e3879b8cd40c04b63b5fcaf2809c100cb195 100644 (file)
@@ -54,12 +54,12 @@ void AliVZEROTrigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
 
-   fInputs.AddLast( new AliTriggerInput( "VZERO_LEFT", "At least one hit in the left VZERO", 0x01 ) );
-   fInputs.AddLast( new AliTriggerInput( "VZERO_RIGHT","At least one hit in the right VZERO", 0x02 ) );
-   fInputs.AddLast( new AliTriggerInput( "VZERO_AND",  "At least one hit in the each (left and right) VZERO", 0x04 ) );
-   fInputs.AddLast( new AliTriggerInput( "VZERO_OR",   "At least one hit in the one (left one right) VZERO", 0x08 ) );
+   fInputs.AddLast( new AliTriggerInput( "VZERO_LEFT", "VZERO", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "VZERO_RIGHT","VZERO", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "VZERO_AND",  "VZERO", 0 ) );
+   fInputs.AddLast( new AliTriggerInput( "VZERO_OR",   "VZERO", 0 ) );
 
-   fInputs.AddLast( new AliTriggerInput( "VZERO_BEAMGAS", "Beam gas VZERO trigger ", 0x010 ) );
+   fInputs.AddLast( new AliTriggerInput( "VZERO_BEAMGAS", "VZERO", 0 ) );
 }
 
 //______________________________________________________________________
index c92ba5292736b1bd52b3915f933cbb7b8ce5d395..bf85487fc2ba1ada0b0d34bb70f5aaafcfcce1b1 100644 (file)
@@ -62,10 +62,10 @@ void AliZDCTrigger::CreateInputs()
    // Do not create inputs again!!
    if( fInputs.GetEntriesFast() > 0 ) return;
    
-   fInputs.AddLast(new AliTriggerInput("ZDC_1_L1",   "ZDC Minimum Bias", 0x01));
-   fInputs.AddLast(new AliTriggerInput("ZDC_2_L1",   "ZDC Semi-central", 0x02));
-   fInputs.AddLast(new AliTriggerInput("ZDC_3_L1",   "ZDC Central", 0x04));
-   fInputs.AddLast(new AliTriggerInput("ZDC_EMD_L1", "ZDC EMD events", 0x08));
+   fInputs.AddLast(new AliTriggerInput("ZDC_MB_L1",   "ZDC", 0));
+   fInputs.AddLast(new AliTriggerInput("ZDC_Semi_L1", "ZDC", 0));
+   fInputs.AddLast(new AliTriggerInput("ZDC_Cent_L1", "ZDC", 0));
+   fInputs.AddLast(new AliTriggerInput("ZDC_EMD_L1",  "ZDC", 0));
 }
 
 //________________________________________________________________