From c6b3635cf4ea474d74a0fdf27b35c9aecbbeeaa3 Mon Sep 17 00:00:00 2001 From: EBerzin Date: Thu, 19 Sep 2024 22:11:33 -0700 Subject: [PATCH 1/5] added optimized 8 GeV trigger thresholds --- Recon/python/simpleTrigger.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Recon/python/simpleTrigger.py b/Recon/python/simpleTrigger.py index 57fdff5be..96fddd202 100644 --- a/Recon/python/simpleTrigger.py +++ b/Recon/python/simpleTrigger.py @@ -40,7 +40,10 @@ def __init__(self, name, beamEnergy) : super().__init__(name,'recon::TriggerProcessor','Recon') self.beamEnergy = beamEnergy - self.thresholds = [ self.beamEnergy/4000.*1500.0, self.beamEnergy/4000.*1000. + self.beamEnergy, self.beamEnergy/4000.*500. + 2*self.beamEnergy, self.beamEnergy/4000.*100. + 3*self.beamEnergy ] + if (self.beamEnergy == 4000.): + self.thresholds = [ self.beamEnergy/4000.*1500.0, self.beamEnergy/4000.*1000. + self.beamEnergy, self.beamEnergy/4000.*500. + 2*self.beamEnergy, self.beamEnergy/4000.*100. + 3*self.beamEnergy ] + else: + self.thresholds = [ 3000., 10790., 18540., 26250. ] self.mode = 0 self.start_layer = 0 self.end_layer = 20 From 31c4e54dba46f9093c2493b14bc44c0e35c58eb8 Mon Sep 17 00:00:00 2001 From: EBerzin <66688168+EBerzin@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:00:36 -0700 Subject: [PATCH 2/5] Directly write 4 GeV thresholds Co-authored-by: Tamas Vami --- Recon/python/simpleTrigger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Recon/python/simpleTrigger.py b/Recon/python/simpleTrigger.py index 96fddd202..47d5d668e 100644 --- a/Recon/python/simpleTrigger.py +++ b/Recon/python/simpleTrigger.py @@ -41,7 +41,7 @@ def __init__(self, name, beamEnergy) : self.beamEnergy = beamEnergy if (self.beamEnergy == 4000.): - self.thresholds = [ self.beamEnergy/4000.*1500.0, self.beamEnergy/4000.*1000. + self.beamEnergy, self.beamEnergy/4000.*500. + 2*self.beamEnergy, self.beamEnergy/4000.*100. + 3*self.beamEnergy ] + self.thresholds = [ 3000, 10000, 17000, 24200 ] else: self.thresholds = [ 3000., 10790., 18540., 26250. ] self.mode = 0 From b984b6eb1f6a8951eec97b9fdb34984371decb59 Mon Sep 17 00:00:00 2001 From: Tamas Vami Date: Fri, 20 Sep 2024 09:06:03 -0700 Subject: [PATCH 3/5] Make thresholds floats in simpleTrigger --- Recon/python/simpleTrigger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Recon/python/simpleTrigger.py b/Recon/python/simpleTrigger.py index 47d5d668e..c75ae546a 100644 --- a/Recon/python/simpleTrigger.py +++ b/Recon/python/simpleTrigger.py @@ -41,7 +41,7 @@ def __init__(self, name, beamEnergy) : self.beamEnergy = beamEnergy if (self.beamEnergy == 4000.): - self.thresholds = [ 3000, 10000, 17000, 24200 ] + self.thresholds = [ 3000., 10000., 17000., 24200. ] else: self.thresholds = [ 3000., 10790., 18540., 26250. ] self.mode = 0 From 458a1c50ce2467d296932d0c1ae679483c47f9ef Mon Sep 17 00:00:00 2001 From: Tamas Vami Date: Fri, 20 Sep 2024 12:32:18 -0700 Subject: [PATCH 4/5] Use the correct numbers for 4 GeV case --- Recon/python/simpleTrigger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Recon/python/simpleTrigger.py b/Recon/python/simpleTrigger.py index c75ae546a..797335f20 100644 --- a/Recon/python/simpleTrigger.py +++ b/Recon/python/simpleTrigger.py @@ -41,7 +41,7 @@ def __init__(self, name, beamEnergy) : self.beamEnergy = beamEnergy if (self.beamEnergy == 4000.): - self.thresholds = [ 3000., 10000., 17000., 24200. ] + self.thresholds = [ 1500., 5000., 8500., 12100. ] else: self.thresholds = [ 3000., 10790., 18540., 26250. ] self.mode = 0 From 849c9a429cabb0b443150005acd9baab456f725b Mon Sep 17 00:00:00 2001 From: EBerzin Date: Thu, 26 Sep 2024 11:16:21 -0700 Subject: [PATCH 5/5] added Megan's 4GeV thresholds --- Recon/python/simpleTrigger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Recon/python/simpleTrigger.py b/Recon/python/simpleTrigger.py index 797335f20..d0f70644f 100644 --- a/Recon/python/simpleTrigger.py +++ b/Recon/python/simpleTrigger.py @@ -41,7 +41,7 @@ def __init__(self, name, beamEnergy) : self.beamEnergy = beamEnergy if (self.beamEnergy == 4000.): - self.thresholds = [ 1500., 5000., 8500., 12100. ] + self.thresholds = [ 1500., 5000., 8200., 11800. ] else: self.thresholds = [ 3000., 10790., 18540., 26250. ] self.mode = 0