From: cvetan Date: Fri, 3 Jul 2009 11:25:10 +0000 (+0000) Subject: VZERO trigger inputs following trigger naming conventions. So far only beam A and... X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=11b1e8cbf90f3be8e3d0e25b8e749f3672218787 VZERO trigger inputs following trigger naming conventions. So far only beam A and C side are ok. Some of the other inputs that are present are defined as descriptors in the naming scheme. Still some owrk to be done on both sides - VZERO and trigger coordination --- diff --git a/GRP/CTP/Pb-Pb.cfg b/GRP/CTP/Pb-Pb.cfg index b40b8056c08..3eb557f40f0 100644 --- a/GRP/CTP/Pb-Pb.cfg +++ b/GRP/CTP/Pb-Pb.cfg @@ -4,8 +4,8 @@ INPUTS: VZERO_AND V0 0 42 3 VZERO_OR V0 0 43 2 VZERO_BEAMGAS V0 0 44 5 -VZERO_LEFT V0 0 45 10 -VZERO_RIGHT V0 0 46 11 +0VBA V0 0 45 10 +0VBC V0 0 46 11 SPD_GFO_L0 SPD 0 20 8 SPD_HMULT_L0 SPD 0 22 9 0TVX T0 0 70 1 diff --git a/GRP/CTP/p-p.cfg b/GRP/CTP/p-p.cfg index 7430ef97d1c..20274e9e36a 100644 --- a/GRP/CTP/p-p.cfg +++ b/GRP/CTP/p-p.cfg @@ -4,8 +4,8 @@ INPUTS: VZERO_AND V0 0 42 5 VZERO_OR V0 0 43 2 VZERO_BEAMGAS V0 0 44 3 -VZERO_LEFT V0 0 45 10 -VZERO_RIGHT V0 0 46 11 +0VBA V0 0 45 10 +0VBC V0 0 46 11 0SMB SPD 0 20 4 0SH1 SPD 0 22 9 0TVX T0 0 70 1 @@ -35,8 +35,8 @@ MBBG2 0SMB MBBG3 VZERO_BEAMGAS MUL l0fmb1 0MSL MUH l0fmb1 0MSH -V0LEFT VZERO_LEFT -V0RIGHT VZERO_RIGHT +V0LEFT 0VBA +V0RIGHT 0VBC T0A 0T0A T0C 0T0C SPDGFO 0SMB diff --git a/VZERO/AliVZEROTrigger.cxx b/VZERO/AliVZEROTrigger.cxx index 707b23e4fe6..c06b1f8d249 100644 --- a/VZERO/AliVZEROTrigger.cxx +++ b/VZERO/AliVZEROTrigger.cxx @@ -52,26 +52,23 @@ void AliVZEROTrigger::CreateInputs() fInputs.AddLast( new AliTriggerInput( "VZERO_BBA_AND_BBC", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_BBA_OR_BBC","VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_BGA_AND_BBC", "VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_BGA", "VZERO", 0 ) ); + fInputs.AddLast( new AliTriggerInput( "0VGA", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_BGC_AND_BBA", "VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_BGC", "VZERO", 0 ) ); + fInputs.AddLast( new AliTriggerInput( "0VGC", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_CTA1_AND_CTC1", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_CTA1_OR_CTC1", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_CTA2_AND_CTC2", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_CTA2_OR_CTC2", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_MTA_AND_MTC", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_MTA_OR_MTC", "VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_BBA", "VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_BBC", "VZERO", 0 ) ); + fInputs.AddLast( new AliTriggerInput( "0VBA", "VZERO", 0 ) ); + fInputs.AddLast( new AliTriggerInput( "0VBC", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_BGA_OR_BGC", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_BEAMGAS", "VZERO", 0 ) ); // The following are kept for compatibility with the CTP configuration file. Will have to be removed at some point fInputs.AddLast( new AliTriggerInput( "VZERO_AND", "VZERO", 0 ) ); fInputs.AddLast( new AliTriggerInput( "VZERO_OR","VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_LEFT", "VZERO", 0 ) ); - fInputs.AddLast( new AliTriggerInput( "VZERO_RIGHT", "VZERO", 0 ) ); - } //______________________________________________________________________ @@ -104,25 +101,23 @@ void AliVZEROTrigger::Trigger() if(triggerSimulator->GetBBAandBBC()) SetInput( "VZERO_BBA_AND_BBC" ); if(triggerSimulator->GetBBAorBBC()) SetInput( "VZERO_BBA_OR_BBC" ); if(triggerSimulator->GetBGAandBBC()) SetInput( "VZERO_BGA_AND_BBC" ); - if(triggerSimulator->GetBGA()) SetInput( "VZERO_BGA" ); + if(triggerSimulator->GetBGA()) SetInput( "0VGA" ); if(triggerSimulator->GetBGCandBBA()) SetInput( "VZERO_BGC_AND_BBA" ); - if(triggerSimulator->GetBGC()) SetInput( "VZERO_BGC" ); + if(triggerSimulator->GetBGC()) SetInput( "0VGC" ); if(triggerSimulator->GetCTA1andCTC1()) SetInput( "VZERO_CTA1_AND_CTC1" ); if(triggerSimulator->GetCTA1orCTC1()) SetInput( "VZERO_CTA1_OR_CTC1" ); if(triggerSimulator->GetCTA2andCTC2()) SetInput( "VZERO_CTA2_AND_CTC2" ); if(triggerSimulator->GetCTA1orCTC1()) SetInput( "VZERO_CTA1_OR_CTC1" ); if(triggerSimulator->GetMTAandMTC()) SetInput( "VZERO_MTA_AND_MTC" ); if(triggerSimulator->GetMTAorMTC()) SetInput( "VZERO_MTA_OR_MTC" ); - if(triggerSimulator->GetBBA()) SetInput( "VZERO_BBA" ); - if(triggerSimulator->GetBBC()) SetInput( "VZERO_BBC" ); + if(triggerSimulator->GetBBA()) SetInput( "0VBA" ); + if(triggerSimulator->GetBBC()) SetInput( "0VBC" ); if(triggerSimulator->GetBGAorBGC()) SetInput( "VZERO_BGA_OR_BGC" ); if(triggerSimulator->GetBeamGas()) SetInput( "VZERO_BEAMGAS" ); // The following are kept for compatibility with the CTP configuration file. Will have to be removed at some point - if(triggerSimulator->GetBBAandBBC()) SetInput( "VZERO_AND" ); - if(triggerSimulator->GetBBAorBBC()) SetInput( "VZERO_OR" ); - if(triggerSimulator->GetBBA()) SetInput( "VZERO_LEFT" ); - if(triggerSimulator->GetBBC()) SetInput( "VZERO_RIGHT" ); + if(triggerSimulator->GetBBAandBBC()) SetInput( "VZERO_AND" ); + if(triggerSimulator->GetBBAorBBC()) SetInput( "VZERO_OR" ); return; }