From 3bb6ff804c3ee1643e5f123e04d034c43f4bbf06 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Mon, 30 Jan 2017 14:38:55 -0500
Subject: [PATCH] Update example hodtest.C and it's template and def files to
account for changes to Cerenkov class
---
examples/hodtest.C | 2 +-
examples/hodtest_cuts.def | 8 ++++----
examples/output.def | 2 +-
examples/output_bpw.def | 2 +-
examples/report.template | 12 ++++++------
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/examples/hodtest.C b/examples/hodtest.C
index 9c01c16..1bc31d4 100644
--- a/examples/hodtest.C
+++ b/examples/hodtest.C
@@ -42,7 +42,7 @@
HMS->AddDetector( new THcDC("dc", "Drift Chambers" ));
THcAerogel* aerogel = new THcAerogel("aero", "Aerogel Cerenkov" );
HMS->AddDetector( aerogel );
- THcCherenkov* cherenkov = new THcCherenkov("cher", "Gas Cerenkov" );
+ THcCherenkov* cherenkov = new THcCherenkov("cer", "Gas Cerenkov" );
HMS->AddDetector( cherenkov );
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("HS","HC scaler event type 0");
diff --git a/examples/hodtest_cuts.def b/examples/hodtest_cuts.def
index 0bfba0a..201b939 100644
--- a/examples/hodtest_cuts.def
+++ b/examples/hodtest_cuts.def
@@ -124,8 +124,8 @@ RawCoarseReconstruct !Pedestal_event
Block: Physics
HMSScinGood H.hod.goodscinhit == 1
-HMSScinShould HMSScinGood && H.cal.etotnorm > 0.7 && H.cher.npesum > 2.0
-HMSScinShoulde HMSScinGood && H.cher.npesum > 2.0
+HMSScinShould HMSScinGood && H.cal.etotnorm > 0.7 && H.cer.npesum > 2.0
+HMSScinShoulde HMSScinGood && H.cer.npesum > 2.0
HMSScinShouldh H.hod.goodscinhit == 1 && g.evtyp == 1
HMSScinDid HMSScinShould && H.dc.ntrack > 0
@@ -133,8 +133,8 @@ HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
HMSScinDidh HMSScinShouldh && H.dc.ntrack > 0
BHMSScinShould HMSScinShould && H.hod.betanotrack >= 0.1 && g.evtyp==3
-BHMSScinShoulde BHMSScinShould && H.cher.npesum > 0.2 && ( H.gold.beta > ( H.hod.betap - 0.5 ) ) && ( H.gold.beta < ( H.hod.betap + 0.5 ) )
-BHMSScinShouldh BHMSScinShould && H.cher.npesum > 0.2
+BHMSScinShoulde BHMSScinShould && H.cer.npesum > 0.2 && ( H.gold.beta > ( H.hod.betap - 0.5 ) ) && ( H.gold.beta < ( H.hod.betap + 0.5 ) )
+BHMSScinShouldh BHMSScinShould && H.cer.npesum > 0.2
BHMSScinDid BHMSScinShould && H.dc.ntrack > 0
BHMSScinDide BHMSScinShoulde && H.dc.ntrack > 0
diff --git a/examples/output.def b/examples/output.def
index 6c9935d..fff5b0d 100644
--- a/examples/output.def
+++ b/examples/output.def
@@ -4,7 +4,7 @@ block H.dc.*
block H.hod.*
block H.cal.*
block H.aero.*
-block H.cher.*
+block H.cer.*
block H.tr.*
block S.dc.*
block S.hod.*
diff --git a/examples/output_bpw.def b/examples/output_bpw.def
index 0fc6248..df63ef7 100644
--- a/examples/output_bpw.def
+++ b/examples/output_bpw.def
@@ -4,7 +4,7 @@ block H.dc.*
block H.hod.*
block H.cal.*
block H.aero.*
-block H.cher.*
+block H.cer.*
block H.tr.*
block RB.*
block g.evtyp
diff --git a/examples/report.template b/examples/report.template
index 55571e2..1958873 100644
--- a/examples/report.template
+++ b/examples/report.template
@@ -385,12 +385,12 @@ Good Track Requirements:
4. {hcer_et_min:%6.2f} < calorimeter energy < {hcer_et_max:%6.2f}
Threshold set at {hcer_threshold:%6.2f}
-Mirror 1 Efficiency = {H.cher.cerfiredcounter[0]/( H.cher.certrackcounter[0] + 0.0001 ):%5.3f}
-Mirror 1 {H.cher.cerfiredcounter[0]:%6d} of {H.cher.certrackcounter[0]:%6d} good tracks.
-Mirror 2 Efficiency = {H.cher.cerfiredcounter[1]/( H.cher.certrackcounter[1] + 0.0001 ):%5.3f}
-Mirror 2 {H.cher.cerfiredcounter[1]:%6d} of {H.cher.certrackcounter[1]:%6d} good tracks.
-Overall Efficiency = {H.cher.cerfiredcounter[2]/( H.cher.certrackcounter[2] + 0.0001 ):%5.3f}
-Overall {H.cher.cerfiredcounter[2]:%6d} of {H.cher.certrackcounter[2]:%6d} good tracks.
+Mirror 1 Efficiency = {H.cer.cerfiredcounter[0]/( H.cer.certrackcounter[0] + 0.0001 ):%5.3f}
+Mirror 1 {H.cer.cerfiredcounter[0]:%6d} of {H.cer.certrackcounter[0]:%6d} good tracks.
+Mirror 2 Efficiency = {H.cer.cerfiredcounter[1]/( H.cer.certrackcounter[1] + 0.0001 ):%5.3f}
+Mirror 2 {H.cer.cerfiredcounter[1]:%6d} of {H.cer.certrackcounter[1]:%6d} good tracks.
+Overall Efficiency = {H.cer.cerfiredcounter[2]/( H.cer.certrackcounter[2] + 0.0001 ):%5.3f}
+Overall {H.cer.cerfiredcounter[2]:%6d} of {H.cer.certrackcounter[2]:%6d} good tracks.
****************************
* Calorimeter Efficiencies *
--
GitLab