Fix bad config. names for HcalEndcap.

eic · Nov 2, 2022 · 12cda3c · 12cda3c
1 parent 56bcd81
commit 12cda3c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNMergedHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNMergedHits.h
@@ -30,9 +30,11 @@ class CalorimeterHit_factory_HcalEndcapNMergedHits : public JFactoryT<edm4eic::C
 
         m_geoSvc= app->GetService<JDD4hep_service>();
 
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:input_tag", m_input_tag);
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:fields", u_fields);
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:refs",  u_refs);
+        app->SetDefaultParameter("HCAL:HcalEndcapNMergedHits:input_tag", m_input_tag);
+        app->SetDefaultParameter("HCAL:HcalEndcapNMergedHits:readout", m_readout);
+        app->SetDefaultParameter("HCAL:HcalEndcapNMergedHits:fields", u_fields);
+        app->SetDefaultParameter("HCAL:HcalEndcapNMergedHits:refs",  u_refs);
+
 
         initialize();
     }

diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapPMergedHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapPMergedHits.h
@@ -30,9 +30,10 @@ class CalorimeterHit_factory_HcalEndcapPMergedHits : public JFactoryT<edm4eic::C
 
         m_geoSvc= app->GetService<JDD4hep_service>();
 
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:input_tag", m_input_tag);
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:fields", u_fields);
-        app->SetDefaultParameter("HCAL:HcalBarrelMergedHits:refs",  u_refs);
+        app->SetDefaultParameter("HCAL:HcalEndcapPMergedHits:input_tag", m_input_tag);
+        app->SetDefaultParameter("HCAL:HcalEndcapPMergedHits:readout", m_readout);
+        app->SetDefaultParameter("HCAL:HcalEndcapPMergedHits:fields", u_fields);
+        app->SetDefaultParameter("HCAL:HcalEndcapPMergedHits:refs",  u_refs);
 
         initialize();
     }

diff --git a/src/tools/default_flags_table/reco_flags.py b/src/tools/default_flags_table/reco_flags.py
@@ -484,6 +484,11 @@
     ('HCAL:HcalEndcapNRecHits:thresholdFactor',                  '4',                              ''),
     ('HCAL:HcalEndcapNRecHits:thresholdValue',                   '1',                              '*'),
 
+    ('HCAL:HcalEndcapNMergedHits:input_tag',                     'HcalEndcapNRecHits',             '*'),
+    ('HCAL:HcalEndcapNMergedHits:readout',                       'HcalEndcapNHits',                '*'),
+    ('HCAL:HcalEndcapNMergedHits:fields',                        'layer,slice',                    '*'),
+    ('HCAL:HcalEndcapNMergedHits:refs',                          '1,0',                            '*'),
+
     ('HCAL:HcalEndcapNIslandProtoClusters:dimScaledLocalDistXY', '1.5,1.5',                        ''),
     ('HCAL:HcalEndcapNIslandProtoClusters:globalDistEtaPhi',     '',                               ''),
     ('HCAL:HcalEndcapNIslandProtoClusters:globalDistRPhi',       '',                               ''),
@@ -543,6 +548,11 @@
     ('HCAL:HcalEndcapPRecHits:thresholdFactor',                  '5',                              '*'),
     ('HCAL:HcalEndcapPRecHits:thresholdValue',                   '3',                              '*'),
 
+    ('HCAL:HcalEndcapPMergedHits:input_tag',                     'HcalEndcapPRecHits',             '*'),
+    ('HCAL:HcalEndcapPMergedHits:readout',                       'HcalEndcapPHits',                '*'),
+    ('HCAL:HcalEndcapPMergedHits:fields',                        'layer,slice',                    '*'),
+    ('HCAL:HcalEndcapPMergedHits:refs',                          '1,0',                            '*'),
+
     ('HCAL:HcalEndcapPIslandProtoClusters:dimScaledLocalDistXY', '1.5,1.5',                        ''),
     ('HCAL:HcalEndcapPIslandProtoClusters:globalDistEtaPhi',     '',                               ''),
     ('HCAL:HcalEndcapPIslandProtoClusters:globalDistRPhi',       '',                               ''),