adding 'MC_pp_v6_tightperf_mc_prescale' to the allowedValues in TriggerFlags...

adding 'MC_pp_v6_tightperf_mc_prescale' to the allowedValues in TriggerFlags for new tightperf ps set (ATR-13154) (TriggerJobOpts-00-05-13)

	* adding 'MC_pp_v6_tightperf_mc_prescale' to the allowedValues in TriggerFlags for new tightperf ps set (ATR-13154)
	* TriggerJobOpts-00-05-13

2016-01-14 Joerg Stelzer
	* python/xxxTriggerGetter.py: enabling reduced granularity muon input for L1Topo in L1Sim and HLTSim (not for data)
	* TriggerJobOpts-00-05-12

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py

@@ -186,6 +186,16 @@ class HLTSimulationGetter(Configured):
                 
             # TrigSteer_HLT.doL1TopoSimulation = TriggerFlags.doL1Topo() # this later needs to be extented to also run when we take data with L1Topo
             TrigSteer_HLT.doL1TopoSimulation = True # always needs to run if the HLT is simulated
+            if hasattr(TrigSteer_HLT.LvlTopoConverter, 'MuonInputProvider'):
+                print "TrigSteer_HLT.LvlTopoConverter has attribute MuonInputProvider"
+
+                from AthenaCommon.GlobalFlags  import globalflags
+                if globalflags.DataSource()!='data':
+                    log.info("Muon eta/phi encoding with reduced granularity for MC (L1Topo emulation for HLT seeding)")
+                    TrigSteer_HLT.LvlTopoConverter.MuonInputProvider.MuonEncoding = 1 # reduced granularity muon input
+                else:
+                    log.info("Muon eta/phi encoding with full granularity for data (L1Topo emulation for HLT seeding) - should be faced out")
+                    TrigSteer_HLT.LvlTopoConverter.MuonInputProvider.MuonEncoding = 0 # full granularity muon input - should be faced out
 
             from TrigEDMConfig.TriggerEDM import  getHLTPreregistrationList, getEDMLibraries
             TrigSteer_HLT.Navigation.ClassesToPreregister = getHLTPreregistrationList()

Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py

@@ -153,9 +153,19 @@ class Lvl1SimulationGetter (Configured):
                     
 
             if TriggerFlags.doL1Topo():
+                log.info("Enabling L1Topo simulation")
                 from L1TopoSimulation.L1TopoSimulationConfig import L1TopoSimulation
                 topSequence += L1TopoSimulation()
-                #topSequence.L1TopoSimulation.OutputLevel = DEBUG
+
+                # enable the reduced (coarse) granularity topo simulation
+                # currently only for MC
+                from AthenaCommon.GlobalFlags  import globalflags
+                if globalflags.DataSource()!='data':
+                    log.info("Muon eta/phi encoding with reduced granularity for MC (L1 Simulation)")
+                    topSequence.L1TopoSimulation.MuonInputProvider.MuonEncoding = 1
+                else:
+                    log.info("Muon eta/phi encoding with full granularity for data (L1 Simulation) - should be faced out")
+                    topSequence.L1TopoSimulation.MuonInputProvider.MuonEncoding = 0
 
 
             log.info("adding ctp simulation to the topSequence")

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py

@@ -1041,7 +1041,7 @@ class triggerMenuSetup(JobProperty):
         'Physics_HI_v3', 'Physics_HI_v3_no_prescale', # for 2015 lead-lead menu 
         'MC_HI_v3', 'MC_HI_v3_tight_mc_prescale',
 
-        'MC_pp_v6','Physics_pp_v6','MC_pp_v6_no_prescale', 'MC_pp_v6_tight_mc_prescale', 'MC_pp_v6_loose_mc_prescale','Physics_pp_v6_tight_physics_prescale',
+        'MC_pp_v6','Physics_pp_v6','MC_pp_v6_no_prescale', 'MC_pp_v6_tight_mc_prescale', 'MC_pp_v6_tightperf_mc_prescale', 'MC_pp_v6_loose_mc_prescale','Physics_pp_v6_tight_physics_prescale',
         ]
 
     _default_menu='MC_pp_v6_tight_mc_prescale'