fix: propagate parameters from reco_flags to cpp plugins

This addresses a lot of the discrepancies in https://eic.github.io/EICrecon/#/table_flags/flags_view
eic · Dec 28, 2022 · 18daa58 · 18daa58
1 parent fe6fc3e
commit 18daa58
Show file tree

Hide file tree

Showing 25 changed files with 75 additions and 75 deletions.
diff --git a/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h b/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h
@@ -29,8 +29,8 @@ class ProtoCluster_factory_B0ECalIslandProtoClusters : public JFactoryT<edm4eic:
         m_input_tag = "B0ECalRecHits";
 
         m_splitCluster=false;               // from ATHENA reconstruction.py
-        m_minClusterHitEdep=30.0 * dd4hep::MeV;    // from ATHENA reconstruction.py
-        m_minClusterCenterEdep=1.0 * dd4hep::MeV; // from ATHENA reconstruction.py
+        m_minClusterHitEdep=1.0 * dd4hep::MeV;    // from ATHENA reconstruction.py
+        m_minClusterCenterEdep=30.0 * dd4hep::MeV; // from ATHENA reconstruction.py
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // from ATHENA reconstruction.py

diff --git a/src/detectors/B0ECAL/RawCalorimeterHit_factory_B0ECalRawHits.h b/src/detectors/B0ECAL/RawCalorimeterHit_factory_B0ECalRawHits.h
@@ -39,7 +39,7 @@ class RawCalorimeterHit_factory_B0ECalRawHits : public JFactoryT<edm4hep::RawCal
         u_eRes = {0.0,0.02,0.0};
         m_tRes = 0.0 * dd4hep::ns;
         m_capADC = 16384;
-        m_dyRangeADC = 1 * dd4hep::GeV;
+        m_dyRangeADC = 20 * dd4hep::GeV;
         m_pedMeanADC = 100;
         m_pedSigmaADC = 1;
         m_resolutionTDC = 1e-11;

diff --git a/src/detectors/BEMC/RawCalorimeterHit_factory_EcalBarrelScFiRawHits.h b/src/detectors/BEMC/RawCalorimeterHit_factory_EcalBarrelScFiRawHits.h
@@ -38,10 +38,10 @@ class RawCalorimeterHit_factory_EcalBarrelScFiRawHits : public JFactoryT<edm4hep
         m_input_tag = "EcalBarrelScFiHits";
         u_eRes = {0.0 * dd4hep::MeV};
         m_tRes = 0.0 * dd4hep::ns;
-        m_capADC = 8096;
-        m_dyRangeADC = 100 * dd4hep::MeV;
-        m_pedMeanADC = 400;
-        m_pedSigmaADC = 3.2;
+        m_capADC = 16384;
+        m_dyRangeADC = 75 * dd4hep::MeV;
+        m_pedMeanADC = 20;
+        m_pedSigmaADC = 0.3;
         m_resolutionTDC = 10 * dd4hep::picosecond;
         m_corrMeanScale = 1.0;
         m_geoSvcName = "ActsGeometryProvider";

diff --git a/src/detectors/EEMC/CalorimeterHit_factory_EcalEndcapPRecHits.h b/src/detectors/EEMC/CalorimeterHit_factory_EcalEndcapPRecHits.h
@@ -25,18 +25,18 @@ class CalorimeterHit_factory_EcalEndcapPRecHits : public JFactoryT<edm4eic::Calo
         m_input_tag = "EcalEndcapPRawHits";
 
         // digitization settings, must be consistent with digi class
-        m_capADC=8096;//{this, "capacityADC", 8096};
-        m_dyRangeADC=100. * dd4hep::MeV;//{this, "dynamicRangeADC", 100. * dd4hep::MeV};
-        m_pedMeanADC=400;//{this, "pedestalMean", 400};
-        m_pedSigmaADC=3.2;//{this, "pedestalSigma", 3.2};
+        m_capADC=16384;//{this, "capacityADC", 8096};
+        m_dyRangeADC=3. * dd4hep::GeV;//{this, "dynamicRangeADC", 100. * dd4hep::MeV};
+        m_pedMeanADC=100;//{this, "pedestalMean", 400};
+        m_pedSigmaADC=0.7;//{this, "pedestalSigma", 3.2};
         m_resolutionTDC=10 * dd4hep::picosecond;//{this, "resolutionTDC", 10 * ps};
 
         // zero suppression values
-        m_thresholdFactor=4.0;//{this, "thresholdFactor", 0.0};
-        m_thresholdValue=0.0;//{this, "thresholdValue", 0.0};
+        m_thresholdFactor=5.0;//{this, "thresholdFactor", 0.0};
+        m_thresholdValue=2.0;//{this, "thresholdValue", 0.0};
 
         // energy correction with sampling fraction
-        m_sampFrac=0.998;//{this, "samplingFraction", 1.0};
+        m_sampFrac=0.03;//{this, "samplingFraction", 1.0};
 
         // geometry service to get ids, ignored if no names provided
         m_geoSvcName="geoServiceName";

diff --git a/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapNRawHits.h b/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapNRawHits.h
@@ -36,7 +36,7 @@ class RawCalorimeterHit_factory_EcalEndcapNRawHits : public JFactoryT<edm4hep::R
 
         // Set default values for all config. parameters in CalorimeterHitDigi algorithm
         m_input_tag = "EcalEndcapNHits";
-        u_eRes = {};
+        u_eRes = {0.0 * dd4hep::MeV, 0.02 * dd4hep::MeV, 0.0 * dd4hep::MeV};
         m_tRes = 0.0 * dd4hep::ns;
         m_capADC = 16384;
         m_dyRangeADC = 20 * dd4hep::GeV;

diff --git a/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPInsertRawHits.h b/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPInsertRawHits.h
@@ -36,16 +36,16 @@ class RawCalorimeterHit_factory_EcalEndcapPInsertRawHits : public JFactoryT<edm4
 
         // Set default values for all config. parameters in CalorimeterHitDigi algorithm
         m_input_tag = "EcalEndcapPInsertHits";
-        u_eRes = {};
+        u_eRes = {3.16 * dd4hep::MeV, 1.5 * dd4hep::MeV, 0.0 * dd4hep::MeV};
         m_tRes = 0.0 * dd4hep::ns;
-        m_capADC = 8096;
-        m_dyRangeADC = 100 * dd4hep::MeV;
-        m_pedMeanADC = 400;
-        m_pedSigmaADC = 3.2;
+        m_capADC = 16384;
+        m_dyRangeADC = 3 * dd4hep::GeV;
+        m_pedMeanADC = 100;
+        m_pedSigmaADC = 0.7;
         m_resolutionTDC = 10 * dd4hep::picosecond;
-        m_corrMeanScale = 1.0;
+        m_corrMeanScale = 0.03;
         u_fields={};
-        u_refs={};
+        u_refs={1, 1};
         m_geoSvcName = "ActsGeometryProvider";
         m_readout = "";
         m_geoSvc = app->GetService<JDD4hep_service>(); // TODO: implement named geometry service?

diff --git a/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPRawHits.h b/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPRawHits.h
@@ -36,16 +36,16 @@ class RawCalorimeterHit_factory_EcalEndcapPRawHits : public JFactoryT<edm4hep::R
 
         // Set default values for all config. parameters in CalorimeterHitDigi algorithm
         m_input_tag = "EcalEndcapPHits";
-        u_eRes = {};
+        u_eRes = {3.16 * dd4hep::MeV, 1.5 * dd4hep::MeV, 0.0 * dd4hep::MeV};
         m_tRes = 0.0 * dd4hep::ns;
-        m_capADC = 8096;
-        m_dyRangeADC = 100 * dd4hep::MeV;
-        m_pedMeanADC = 400;
-        m_pedSigmaADC = 3.2;
+        m_capADC = 16384;
+        m_dyRangeADC = 3 * dd4hep::GeV;
+        m_pedMeanADC = 100;
+        m_pedSigmaADC = 0.7;
         m_resolutionTDC = 10 * dd4hep::picosecond;
-        m_corrMeanScale = 1.0;
+        m_corrMeanScale = 0.03;
         u_fields={};
-        u_refs={};
+        u_refs={1, 1};
         m_geoSvcName = "ActsGeometryProvider";
         m_readout = "";
         m_geoSvc = app->GetService<JDD4hep_service>(); // TODO: implement named geometry service?

diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelMergedHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelMergedHits.h
@@ -25,7 +25,7 @@ class CalorimeterHit_factory_HcalBarrelMergedHits : public JFactoryT<edm4eic::Ca
         m_input_tag = "HcalBarrelRecHits";
 
         m_readout="HcalBarrelHits";
-        u_fields={"layer", "slice"};
+        u_fields={"tower", "tile"};
         u_refs={1, 0};
 
         m_geoSvc= app->GetService<JDD4hep_service>();

diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelRecHits.h
@@ -26,26 +26,26 @@ class CalorimeterHit_factory_HcalBarrelRecHits : public JFactoryT<edm4eic::Calor
         m_input_tag = "HcalBarrelRawHits";
 
         // digitization settings, must be consistent with digi class
-        m_capADC=8096; // best guess
-        m_dyRangeADC=50. * dd4hep::GeV; // best guess
-        m_pedMeanADC=10; // best guess
-        m_pedSigmaADC=2; // best guess
-        m_resolutionTDC=1 * dd4hep::nanosecond; // best guess
+        m_capADC=256; // best guess
+        m_dyRangeADC=20. * dd4hep::MeV; // best guess
+        m_pedMeanADC=20; // best guess
+        m_pedSigmaADC=0.3; // best guess
+        m_resolutionTDC=10 * dd4hep::picosecond; // best guess
 
         // zero suppression values
         m_thresholdFactor=5.0;// from ATHENA's reconstruction.py
-        m_thresholdValue=0.0;//{this, "thresholdValue", 0.0};
+        m_thresholdValue=1.0;//{this, "thresholdValue", 0.0};
 
         // energy correction with sampling fraction
         m_sampFrac=0.033;  // average, from sPHENIX simulations
 
         // geometry service to get ids, ignored if no names provided
         m_geoSvcName="geoServiceName";
-        m_readout="HcalBarrelHits";  
-        m_layerField="tower";      
-        m_sectorField="sector";      
+        m_readout="HcalBarrelHits";
+        m_layerField="tower";
+        m_sectorField="sector";
 
-        m_localDetElement="";         
+        m_localDetElement="";
         u_localDetFields={};
 
 //        app->SetDefaultParameter("HCAL:tag",              m_input_tag);

diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h
@@ -28,13 +28,13 @@ class CalorimeterHit_factory_HcalEndcapNRecHits : public JFactoryT<edm4eic::Calo
         // digitization settings, must be consistent with digi class
         m_capADC=1024;//{this, "capacityADC", 8096};
         m_dyRangeADC=3.6 * dd4hep::MeV;//{this, "dynamicRangeADC", 100. * dd4hep::MeV};
-        m_pedMeanADC=400;//{this, "pedestalMean", 400};
-        m_pedSigmaADC=3.2;//{this, "pedestalSigma", 3.2};
+        m_pedMeanADC=20;//{this, "pedestalMean", 400};
+        m_pedSigmaADC=0.3;//{this, "pedestalSigma", 3.2};
         m_resolutionTDC=10 * dd4hep::picosecond;//{this, "resolutionTDC", 10 * ps};
 
         // zero suppression values
         m_thresholdFactor=4.0;//{this, "thresholdFactor", 0.0};
-        m_thresholdValue=0.0;//{this, "thresholdValue", 0.0};
+        m_thresholdValue=1.0;//{this, "thresholdValue", 0.0};
 
         // energy correction with sampling fraction
         m_sampFrac=0.998;//{this, "samplingFraction", 1.0};

diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapPRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapPRecHits.h
@@ -26,18 +26,18 @@ class CalorimeterHit_factory_HcalEndcapPRecHits : public JFactoryT<edm4eic::Calo
         m_input_tag = "HcalEndcapPRawHits";
 
         // digitization settings, must be consistent with digi class
-        m_capADC=4096;//{this, "capacityADC", 8096};
-        m_dyRangeADC=200.;//{this, "dynamicRangeADC", 100. * dd4hep::MeV};
-        m_pedMeanADC=200;//{this, "pedestalMean", 400};
-        m_pedSigmaADC=3.2;//{this, "pedestalSigma", 3.2};
+        m_capADC=1024;//{this, "capacityADC", 8096};
+        m_dyRangeADC=3.6 * dd4hep::GeV.;//{this, "dynamicRangeADC", 100. * dd4hep::MeV};
+        m_pedMeanADC=20;//{this, "pedestalMean", 400};
+        m_pedSigmaADC=0.8;//{this, "pedestalSigma", 3.2};
         m_resolutionTDC=10 * dd4hep::picosecond;//{this, "resolutionTDC", 10 * ps};
 
         // zero suppression values
-        m_thresholdFactor=4.0;//{this, "thresholdFactor", 0.0};
-        m_thresholdValue=0.0;//{this, "thresholdValue", 0.0};
+        m_thresholdFactor=5.0;//{this, "thresholdFactor", 0.0};
+        m_thresholdValue=3.0;//{this, "thresholdValue", 0.0};
 
         // energy correction with sampling fraction
-        m_sampFrac=0.033;//{this, "samplingFraction", 1.0};
+        m_sampFrac=0.025;//{this, "samplingFraction", 1.0};
 
         // geometry service to get ids, ignored if no names provided
         m_geoSvcName="geoServiceName";

diff --git a/src/detectors/HCAL/Cluster_factory_HcalBarrelClusters.h b/src/detectors/HCAL/Cluster_factory_HcalBarrelClusters.h
@@ -32,9 +32,9 @@ class Cluster_factory_HcalBarrelClusters : public JFactoryT<edm4eic::Cluster>, C
         //-------- Configuration Parameters ------------
         m_input_simhit_tag="HcalBarrelHits";
         m_input_protoclust_tag="HcalBarrelIslandProtoClusters";
-    
+
         m_sampFrac=1.0;//{this, "samplingFraction", 1.0};
-        m_logWeightBase=3.6;//{this, "logWeightBase", 3.6};
+        m_logWeightBase=6.2;//{this, "logWeightBase", 3.6};
         m_depthCorrection=0.0;//{this, "depthCorrection", 0.0};
         m_energyWeight="log";//{this, "energyWeight", "log"};
         m_moduleDimZName="";//{this, "moduleDimZName", ""};

diff --git a/src/detectors/HCAL/Cluster_factory_HcalBarrelTruthClusters.h b/src/detectors/HCAL/Cluster_factory_HcalBarrelTruthClusters.h
@@ -32,7 +32,7 @@ class Cluster_factory_HcalBarrelTruthClusters : public JFactoryT<edm4eic::Cluste
         m_input_protoclust_tag="HcalBarrelTruthProtoClusters";
 
         m_sampFrac=1.0;//{this, "samplingFraction", 1.0};
-        m_logWeightBase=3.6;//{this, "logWeightBase", 3.6};
+        m_logWeightBase=6.2;//{this, "logWeightBase", 3.6};
         m_depthCorrection=0.0;//{this, "depthCorrection", 0.0};
         m_energyWeight="log";//{this, "energyWeight", "log"};
         m_moduleDimZName="";//{this, "moduleDimZName", ""};

diff --git a/src/detectors/HCAL/Cluster_factory_HcalEndcapNTruthClusters.h b/src/detectors/HCAL/Cluster_factory_HcalEndcapNTruthClusters.h
@@ -32,7 +32,7 @@ class Cluster_factory_HcalEndcapNTruthClusters : public JFactoryT<edm4eic::Clust
         m_input_protoclust_tag="HcalEndcapNTruthProtoClusters";
 
         m_sampFrac=1.0;//{this, "samplingFraction", 1.0};
-        m_logWeightBase=3.6;//{this, "logWeightBase", 3.6};
+        m_logWeightBase=6.2;//{this, "logWeightBase", 3.6};
         m_depthCorrection=0.0;//{this, "depthCorrection", 0.0};
         m_energyWeight="log";//{this, "energyWeight", "log"};
         m_moduleDimZName="";//{this, "moduleDimZName", ""};

diff --git a/src/detectors/HCAL/Cluster_factory_HcalEndcapPClusters.h b/src/detectors/HCAL/Cluster_factory_HcalEndcapPClusters.h
@@ -43,7 +43,7 @@ class Cluster_factory_HcalEndcapPClusters : public JFactoryT<edm4eic::Cluster>,
         m_input_simhit_tag="HcalEndcapPHits";
         m_input_protoclust_tag="HcalEndcapPIslandProtoClusters";
 
-        m_sampFrac=1.0;// https://eicweb.phy.anl.gov/EIC/juggler/-/blob/bf366a35b480cda6c610b0dd6a4d4efcfd9a8e03/JugReco/src/components/ClusterRecoCoG.cpp
+        m_sampFrac=0.025;// https://eicweb.phy.anl.gov/EIC/juggler/-/blob/bf366a35b480cda6c610b0dd6a4d4efcfd9a8e03/JugReco/src/components/ClusterRecoCoG.cpp
         m_logWeightBase=6.2;// from ATHENA's reconstruction.py
         m_depthCorrection=0.0;// https://eicweb.phy.anl.gov/EIC/juggler/-/blob/bf366a35b480cda6c610b0dd6a4d4efcfd9a8e03/JugReco/src/components/ClusterRecoCoG.cpp
         m_energyWeight="log";// https://eicweb.phy.anl.gov/EIC/juggler/-/blob/bf366a35b480cda6c610b0dd6a4d4efcfd9a8e03/JugReco/src/components/ClusterRecoCoG.cpp

diff --git a/src/detectors/HCAL/ProtoCluster_factory_HcalBarrelIslandProtoClusters.h b/src/detectors/HCAL/ProtoCluster_factory_HcalBarrelIslandProtoClusters.h
@@ -28,13 +28,13 @@ class ProtoCluster_factory_HcalBarrelIslandProtoClusters : public JFactoryT<edm4
         auto app = GetApplication();
         m_input_tag = "HcalBarrelMergedHits";
 
-        m_splitCluster=true;              // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
-        m_minClusterHitEdep=0.1 * dd4hep::MeV;    // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
-        m_minClusterCenterEdep=3.0 * dd4hep::MeV; // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
+        m_splitCluster=false;              // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
+        m_minClusterHitEdep=3.0 * dd4hep::MeV;    // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
+        m_minClusterCenterEdep=30.0 * dd4hep::MeV; // from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // from ATHENA reconstruction.py
-        u_localDistXY={};     //{this, "localDistXY", {}};
+        u_localDistXY={150*dd4hep::mm, 150*dd4hep::mm};     //{this, "localDistXY", {}};
         u_localDistXZ={};     //{this, "localDistXZ", {}};
         u_localDistYZ={};     //{this, "localDistYZ", {}};
         u_globalDistRPhi={};  //{this, "globalDistRPhi", {}};

diff --git a/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapNIslandProtoClusters.h b/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapNIslandProtoClusters.h
@@ -35,7 +35,7 @@ class ProtoCluster_factory_HcalEndcapNIslandProtoClusters : public JFactoryT<edm
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // https://eicweb.phy.anl.gov/EIC/juggler/-/blob/main/JugReco/src/components/CalorimeterIslandCluster.cpp
-        u_localDistXY={};     //{this, "localDistXY", {}};
+        u_localDistXY={150*dd4hep::mm, 150*dd4hep::mm};     //{this, "localDistXY", {}};
         u_localDistXZ={};     //{this, "localDistXZ", {}};
         u_localDistYZ={};     //{this, "localDistYZ", {}};
         u_globalDistRPhi={};  //{this, "globalDistRPhi", {}};

diff --git a/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters.h b/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters.h
@@ -34,7 +34,7 @@ class ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters : public JFactor
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // https://eicweb.phy.anl.gov/EIC/juggler/-/blob/main/JugReco/src/components/CalorimeterIslandCluster.cpp
-        u_localDistXY={};     //{this, "localDistXY", {}};
+        u_localDistXY={15*dd4hep::mm, 15*dd4hep::mm};     //{this, "localDistXY", {}};
         u_localDistXZ={};     //{this, "localDistXZ", {}};
         u_localDistYZ={};     //{this, "localDistYZ", {}};
         u_globalDistRPhi={};  //{this, "globalDistRPhi", {}};

diff --git a/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapPIslandProtoClusters.h b/src/detectors/HCAL/ProtoCluster_factory_HcalEndcapPIslandProtoClusters.h
@@ -35,7 +35,7 @@ class ProtoCluster_factory_HcalEndcapPIslandProtoClusters : public JFactoryT<edm
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // https://eicweb.phy.anl.gov/EIC/juggler/-/blob/main/JugReco/src/components/CalorimeterIslandCluster.cpp
-        u_localDistXY={};     //{this, "localDistXY", {}};
+        u_localDistXY={15.0*dd4hep::cm, 15.0*dd4hep::cm};     //{this, "localDistXY", {}};
         u_localDistXZ={};     //{this, "localDistXZ", {}};
         u_localDistYZ={};     //{this, "localDistYZ", {}};
         u_globalDistRPhi={};  //{this, "globalDistRPhi", {}};

diff --git a/src/detectors/HCAL/RawCalorimeterHit_factory_HcalBarrelRawHits.h b/src/detectors/HCAL/RawCalorimeterHit_factory_HcalBarrelRawHits.h
@@ -39,14 +39,14 @@ class RawCalorimeterHit_factory_HcalBarrelRawHits : public JFactoryT<edm4hep::Ra
         m_input_tag = "HcalBarrelHits";
         u_eRes = {};
         m_tRes = 0.0 * dd4hep::ns;
-        m_capADC = 8096;
-        m_dyRangeADC = 50 * dd4hep::GeV;
+        m_capADC = 256;
+        m_dyRangeADC = 50 * dd4hep::MeV;
         m_pedMeanADC = 10;
         m_pedSigmaADC = 2.0;
         m_resolutionTDC = 1.0 * dd4hep::ns;
         m_corrMeanScale = 1.0;
         u_fields={};
-        u_refs={};
+        u_refs={1, 0};
         m_geoSvcName = "ActsGeometryProvider";
         m_readout = "";
         m_geoSvc = app->GetService<JDD4hep_service>(); // TODO: implement named geometry service?

diff --git a/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h b/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h
@@ -41,8 +41,8 @@ class RawCalorimeterHit_factory_HcalEndcapNRawHits : public JFactoryT<edm4hep::R
         m_tRes = 0.0 * dd4hep::ns;
         m_capADC = 1024;
         m_dyRangeADC = 3.6 * dd4hep::MeV;
-        m_pedMeanADC = 400;
-        m_pedSigmaADC = 3.2;
+        m_pedMeanADC = 20;
+        m_pedSigmaADC = 0.3;
         m_resolutionTDC = 10 * dd4hep::picosecond;
         m_corrMeanScale = 1.0;
         u_fields={};

diff --git a/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapPRawHits.h b/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapPRawHits.h
@@ -39,10 +39,10 @@ class RawCalorimeterHit_factory_HcalEndcapPRawHits : public JFactoryT<edm4hep::R
         m_input_tag = "HcalEndcapPHits";
         u_eRes = {};
         m_tRes = 0.0 * dd4hep::ns;
-        m_capADC = 4096;
-        m_dyRangeADC = 200. ;
-        m_pedMeanADC = 200 ;
-        m_pedSigmaADC = 3.2;
+        m_capADC = 1024;
+        m_dyRangeADC = 3.6 * dd4hep::GeV ;
+        m_pedMeanADC = 20;
+        m_pedSigmaADC = 0.8;
         m_resolutionTDC = 10 * dd4hep::picosecond;
         m_corrMeanScale = 1.0;
         u_fields={};

diff --git a/src/detectors/ZDC/CalorimeterHit_factory_ZDCEcalRecHits.h b/src/detectors/ZDC/CalorimeterHit_factory_ZDCEcalRecHits.h
@@ -37,7 +37,7 @@ class CalorimeterHit_factory_ZDCEcalRecHits : public JFactoryT<edm4eic::Calorime
         m_thresholdValue=0.0;//{this, "thresholdValue", 0.0};
 
         // energy correction with sampling fraction
-        m_sampFrac=0.998;//{this, "samplingFraction", 1.0};
+        m_sampFrac=1.0;//{this, "samplingFraction", 1.0};
 
         // geometry service to get ids, ignored if no names provided
         m_geoSvcName="geoServiceName";

diff --git a/src/detectors/ZDC/Cluster_factory_ZDCEcalClusters.h b/src/detectors/ZDC/Cluster_factory_ZDCEcalClusters.h
@@ -32,9 +32,9 @@ class Cluster_factory_ZDCEcalClusters : public JFactoryT<edm4eic::Cluster>, Calo
         //-------- Configuration Parameters ------------
         m_input_simhit_tag="ZDCEcalHits";
         m_input_protoclust_tag="ZDCEcalIslandProtoClusters";
-    
+
         m_sampFrac=1.0;//{this, "samplingFraction", 1.0};
-        m_logWeightBase=3.6;//{this, "logWeightBase", 3.6};
+        m_logWeightBase=6.2;//{this, "logWeightBase", 3.6};
         m_depthCorrection=0.0;//{this, "depthCorrection", 0.0};
         m_energyWeight="log";//{this, "energyWeight", "log"};
         m_moduleDimZName="";//{this, "moduleDimZName", ""};

diff --git a/src/detectors/ZDC/ProtoCluster_factory_ZDCEcalIslandProtoClusters.h b/src/detectors/ZDC/ProtoCluster_factory_ZDCEcalIslandProtoClusters.h
@@ -35,7 +35,7 @@ class ProtoCluster_factory_ZDCEcalIslandProtoClusters : public JFactoryT<edm4eic
 
         // neighbour checking distances
         m_sectorDist=5.0 * dd4hep::cm;             // from ATHENA reconstruction.py
-        u_localDistXY={};     //{this, "localDistXY", {}};
+        u_localDistXY={50 * dd4hep::cm, 50 * dd4hep::cm};     //{this, "localDistXY", {}};
         u_localDistXZ={};     //{this, "localDistXZ", {}};
         u_localDistYZ={};     //{this, "localDistYZ", {}};
         u_globalDistRPhi={};  //{this, "globalDistRPhi", {}};