From 572b6f201082bbd2ddf10cc2df56bfe01590e21a Mon Sep 17 00:00:00 2001 From: cvetan Date: Thu, 22 Nov 2007 11:48:04 +0000 Subject: [PATCH] Updates needed to make the trigger inputs compatible with the new constructors. The arguments are now - trigger_input_name, trigger_detector_name, level(0,1) --- ACORDE/AliACORDETrigger.cxx | 4 ++-- EMCAL/AliEMCALTrigger.cxx | 8 ++++---- ITS/AliITSTrigger.cxx | 9 ++++----- MUON/AliMUONTrigger.cxx | 12 ++++++------ PHOS/AliPHOSTrigger.cxx | 10 ++++++---- T0/AliT0Trigger.cxx | 20 ++++++++++---------- TOF/AliTOFTrigger.cxx | 10 +++++----- TRD/AliTRDTriggerL1.cxx | 28 ++++++++++++++-------------- VZERO/AliVZEROTrigger.cxx | 10 +++++----- ZDC/AliZDCTrigger.cxx | 8 ++++---- 10 files changed, 60 insertions(+), 59 deletions(-) diff --git a/ACORDE/AliACORDETrigger.cxx b/ACORDE/AliACORDETrigger.cxx index bfd77dd255f..6a2c3e33c8b 100644 --- a/ACORDE/AliACORDETrigger.cxx +++ b/ACORDE/AliACORDETrigger.cxx @@ -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() diff --git a/EMCAL/AliEMCALTrigger.cxx b/EMCAL/AliEMCALTrigger.cxx index 4877e9e6959..c61bc5ede92 100644 --- a/EMCAL/AliEMCALTrigger.cxx +++ b/EMCAL/AliEMCALTrigger.cxx @@ -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 ) ); } diff --git a/ITS/AliITSTrigger.cxx b/ITS/AliITSTrigger.cxx index 7882a56cfd1..423d2248e9e 100644 --- a/ITS/AliITSTrigger.cxx +++ b/ITS/AliITSTrigger.cxx @@ -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; diff --git a/MUON/AliMUONTrigger.cxx b/MUON/AliMUONTrigger.cxx index eebbf9d1d16..e23466cc6e9 100644 --- a/MUON/AliMUONTrigger.cxx +++ b/MUON/AliMUONTrigger.cxx @@ -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 ) ); } //---------------------------------------------------------------------- diff --git a/PHOS/AliPHOSTrigger.cxx b/PHOS/AliPHOSTrigger.cxx index 5e5d5395d32..85487564ef5 100644 --- a/PHOS/AliPHOSTrigger.cxx +++ b/PHOS/AliPHOSTrigger.cxx @@ -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 ) ); } diff --git a/T0/AliT0Trigger.cxx b/T0/AliT0Trigger.cxx index 4c30bdc3006..23bdfd067ad 100644 --- a/T0/AliT0Trigger.cxx +++ b/T0/AliT0Trigger.cxx @@ -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");; } diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx index a4701fb4248..91626e09b59 100644 --- a/TOF/AliTOFTrigger.cxx +++ b/TOF/AliTOFTrigger.cxx @@ -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)); } //---------------------------------------------------------------------- diff --git a/TRD/AliTRDTriggerL1.cxx b/TRD/AliTRDTriggerL1.cxx index 5b72aa99275..b25a0f78e80 100644 --- a/TRD/AliTRDTriggerL1.cxx +++ b/TRD/AliTRDTriggerL1.cxx @@ -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 )); } diff --git a/VZERO/AliVZEROTrigger.cxx b/VZERO/AliVZEROTrigger.cxx index 75087d5cbef..98c4e3879b8 100644 --- a/VZERO/AliVZEROTrigger.cxx +++ b/VZERO/AliVZEROTrigger.cxx @@ -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 ) ); } //______________________________________________________________________ diff --git a/ZDC/AliZDCTrigger.cxx b/ZDC/AliZDCTrigger.cxx index c92ba529273..bf85487fc2b 100644 --- a/ZDC/AliZDCTrigger.cxx +++ b/ZDC/AliZDCTrigger.cxx @@ -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)); } //________________________________________________________________ -- 2.39.3