diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index 9865f6d766..ab34a9ef82 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -180,7 +180,7 @@ jobs: export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }} export JANA_PLUGIN_PATH=$PWD/lib/EICrecon/plugins${JANA_PLUGIN_PATH:+:${JANA_PLUGIN_PATH}} chmod a+x bin/* - $PWD/bin/eicrecon -Ppodio:output_file=rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4eic.root sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root -Pplugins=dump_flags,janadot -Pdump_flags:json=${{ matrix.detector_config }}_flags.json + $PWD/bin/eicrecon -Ppodio:output_file=rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4eic.root sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root -Pplugins=dump_flags,janadot -Pdump_flags:json=${{ matrix.particle }}_${{ matrix.detector_config }}_flags.json - uses: actions/upload-artifact@v3 with: name: eicrecon_rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4eic.root @@ -188,8 +188,8 @@ jobs: if-no-files-found: error - uses: actions/upload-artifact@v3 with: - name: ${{ matrix.detector_config }}_flags.json - path: ${{ matrix.detector_config }}_flags.json + name: ${{ matrix.particle }}_${{ matrix.detector_config }}_flags.json + path: ${{ matrix.particle }}_${{ matrix.detector_config }}_flags.json if-no-files-found: error - uses: actions/upload-artifact@v3 with: @@ -222,7 +222,7 @@ jobs: export DETECTOR_CONFIG=${DETECTOR}_${{ matrix.detector_config }} export JANA_PLUGIN_PATH=$PWD/lib/EICrecon/plugins${JANA_PLUGIN_PATH:+:${JANA_PLUGIN_PATH}} chmod a+x bin/* - $PWD/bin/run_eicrecon_reco_flags.py sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }} -Pplugins=dump_flags,janadot -Pdump_flags:json=${{ matrix.detector_config }}_right_flags.json + $PWD/bin/run_eicrecon_reco_flags.py sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }} -Pplugins=dump_flags,janadot -Pdump_flags:json=${{ matrix.particle }}_${{ matrix.detector_config }}_right_flags.json - uses: actions/upload-artifact@v3 with: name: run_eicrecon_reco_flags_rec_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4eic.root @@ -230,8 +230,8 @@ jobs: if-no-files-found: error - uses: actions/upload-artifact@v3 with: - name: ${{ matrix.detector_config }}_right_flags.json - path: ${{ matrix.detector_config }}_right_flags.json + name: ${{ matrix.particle }}_${{ matrix.detector_config }}_right_flags.json + path: ${{ matrix.particle }}_${{ matrix.detector_config }}_right_flags.json if-no-files-found: error - uses: actions/upload-artifact@v3 with: @@ -255,11 +255,15 @@ jobs: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: - name: arches_right_flags.json + name: pi_arches_right_flags.json + - uses: actions/download-artifact@v3 + with: + name: pi_brycecanyon_right_flags.json - run: | apk add doxygen graphviz doxygen Doxyfile - cp arches_right_flags.json docs/arches_flags.json + cp pi_arches_right_flags.json docs/arches_flags.json + cp pi_brycecanyon_right_flags.json docs/brycecanyon_flags.json cp -r docs publishing_docs mv html publishing_docs/doxygen - uses: actions/upload-artifact@v3 diff --git a/src/algorithms/tracking/CKFTrackingConfig.h b/src/algorithms/tracking/CKFTrackingConfig.h index 8688034795..e74ee55d0c 100644 --- a/src/algorithms/tracking/CKFTrackingConfig.h +++ b/src/algorithms/tracking/CKFTrackingConfig.h @@ -10,7 +10,7 @@ namespace eicrecon { struct CKFTrackingConfig { std::vector m_etaBins = {}; // {this, "etaBins", {}}; - std::vector m_chi2CutOff = {50.}; //{this, "chi2CutOff", {15.}}; + std::vector m_chi2CutOff = {15.}; //{this, "chi2CutOff", {15.}}; std::vector m_numMeasurementsCutOff = {10}; //{this, "numMeasurementsCutOff", {10}}; }; } diff --git a/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h b/src/detectors/B0ECAL/ProtoCluster_factory_B0ECalIslandProtoClusters.h index ca2b8a4a9d..bbda693432 100644 --- 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 JFactoryTSetDefaultParameter("EEMC:EcalEndcapPInsertTruthClusters:input_protoclust_tag", m_input_protoclust_tag, "Name of input collection to use"); diff --git a/src/detectors/EEMC/Cluster_factory_EcalEndcapPTruthClusters.h b/src/detectors/EEMC/Cluster_factory_EcalEndcapPTruthClusters.h index b8a2a9b659..7381935c1e 100644 --- a/src/detectors/EEMC/Cluster_factory_EcalEndcapPTruthClusters.h +++ b/src/detectors/EEMC/Cluster_factory_EcalEndcapPTruthClusters.h @@ -46,14 +46,14 @@ class Cluster_factory_EcalEndcapPTruthClusters : public JFactoryTSetDefaultParameter("EEMC:EcalEndcapPTruthClusters:input_protoclust_tag", m_input_protoclust_tag, "Name of input collection to use"); diff --git a/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPInsertIslandProtoClusters.h b/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPInsertIslandProtoClusters.h index e87f524784..58fc64dc67 100644 --- a/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPInsertIslandProtoClusters.h +++ b/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPInsertIslandProtoClusters.h @@ -29,17 +29,17 @@ class ProtoCluster_factory_EcalEndcapPInsertIslandProtoClusters : public JFactor m_input_tag = "EcalEndcapPInsertRecHits"; m_splitCluster=false; // from ATHENA reconstruction.py - m_minClusterHitEdep=1.0 * dd4hep::MeV; // from ATHENA reconstruction.py - m_minClusterCenterEdep=30.0 * dd4hep::MeV; // from ATHENA reconstruction.py + m_minClusterHitEdep=0.0 * dd4hep::MeV; // from ATHENA reconstruction.py + m_minClusterCenterEdep=10.0 * dd4hep::MeV; // from ATHENA reconstruction.py // neighbour checking distances m_sectorDist=5.0 * dd4hep::cm; // from ATHENA reconstruction.py - u_localDistXY={}; //{this, "localDistXY", {}}; + u_localDistXY={10.0 * dd4hep::cm, 10.0 * dd4hep::cm}; //{this, "localDistXY", {}}; u_localDistXZ={}; //{this, "localDistXZ", {}}; u_localDistYZ={}; //{this, "localDistYZ", {}}; u_globalDistRPhi={}; //{this, "globalDistRPhi", {}}; u_globalDistEtaPhi={};//{this, "globalDistEtaPhi", {}}; - u_dimScaledLocalDistXY={1.8,1.8};// from ATHENA reconstruction.py + u_dimScaledLocalDistXY={1.5,1.5};// from ATHENA reconstruction.py app->SetDefaultParameter("EEMC:EcalEndcapPInsertIslandProtoClusters:input_tag", m_input_tag, "Name of input collection to use"); diff --git a/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPIslandProtoClusters.h b/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPIslandProtoClusters.h index e6f3e796e0..32477ec9f4 100644 --- a/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPIslandProtoClusters.h +++ b/src/detectors/EEMC/ProtoCluster_factory_EcalEndcapPIslandProtoClusters.h @@ -29,17 +29,17 @@ class ProtoCluster_factory_EcalEndcapPIslandProtoClusters : public JFactoryTSetDefaultParameter("EEMC:EcalEndcapPIslandProtoClusters:input_tag", m_input_tag, "Name of input collection to use"); diff --git a/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapNRawHits.h b/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapNRawHits.h index b7d32ff785..de72b6ed24 100644 --- 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 JFactoryTGetService(); // TODO: implement named geometry service? diff --git a/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPRawHits.h b/src/detectors/EEMC/RawCalorimeterHit_factory_EcalEndcapPRawHits.h index 1c35786dd3..05154713db 100644 --- 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 JFactoryTGetService(); // TODO: implement named geometry service? diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelMergedHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelMergedHits.h index a47576d2fe..e4cd6756ec 100644 --- 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 JFactoryTGetService(); diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalBarrelRecHits.h index da9e2ca559..c94f03768a 100644 --- 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 JFactoryTSetDefaultParameter("HCAL:tag", m_input_tag); diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h index e17084b4bd..e2a9134418 100644 --- 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, 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 index 8fbffaab0b..9a781989ea 100644 --- 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, 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 index d44b4c7878..69b76ede85 100644 --- 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 JFactoryTGetService(); // TODO: implement named geometry service? diff --git a/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h b/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h index 61f92ddb12..c6248ef795 100644 --- 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 - -#include -#include -#include - -class CalorimeterHit_factory_HcalBarrelRecHits : public JFactoryT, CalorimeterHitReco { - -public: - //------------------------------------------ - // Constructor - CalorimeterHit_factory_HcalBarrelRecHits(){ - SetTag("HcalBarrelRecHits"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - - m_input_tag = "HcalBarrelRawHits"; - - // 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_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}; - - // energy correction with sampling fraction - m_sampFrac=0.998;//{this, "samplingFraction", 1.0}; - - // geometry service to get ids, ignored if no names provided - m_geoSvcName="geoServiceName"; - m_readout="HcalBarrelHits"; // from ATHENA's reconstruction.py - m_layerField=""; // from ATHENA's reconstruction.py (i.e. not defined there) - m_sectorField="sector"; // from ATHENA's reconstruction.py - - m_localDetElement=""; // from ATHENA's reconstruction.py (i.e. not defined there) - u_localDetFields={}; // from ATHENA's reconstruction.py (i.e. not defined there) - -// app->SetDefaultParameter("HCAL:tag", m_input_tag); - app->SetDefaultParameter("HCAL:capacityADC", m_capADC); - app->SetDefaultParameter("HCAL:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("HCAL:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("HCAL:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("HCAL:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("HCAL:thresholdFactor", m_thresholdFactor); - app->SetDefaultParameter("HCAL:thresholdValue", m_thresholdValue); - app->SetDefaultParameter("HCAL:samplingFraction", m_sampFrac); - m_geoSvc = app->template GetService(); // TODO: implement named geometry service? - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - rawhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(hits); - hits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // CalorimeterHit_factory_HcalBarrelRecHits_h_ diff --git a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapNRecHits.h b/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapNRecHits.h deleted file mode 100644 index 10e56cfe48..0000000000 --- a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapNRecHits.h +++ /dev/null @@ -1,94 +0,0 @@ - -#ifndef CalorimeterHit_factory_HcalEndcapNRecHits_h_ -#define CalorimeterHit_factory_HcalEndcapNRecHits_h_ - -#include - -#include -#include -#include - -class CalorimeterHit_factory_HcalEndcapNRecHits : public JFactoryT, CalorimeterHitReco { - -public: - //------------------------------------------ - // Constructor - CalorimeterHit_factory_HcalEndcapNRecHits(){ - SetTag("HcalEndcapNRecHits"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - - m_input_tag = "HcalEndcapNRawHits"; - - // 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_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}; - - // energy correction with sampling fraction - m_sampFrac=0.998;//{this, "samplingFraction", 1.0}; - - // geometry service to get ids, ignored if no names provided - m_geoSvcName="geoServiceName"; - m_readout="HcalEndcapNHits"; // from ATHENA's reconstruction.py - m_layerField=""; // from ATHENA's reconstruction.py (i.e. not defined there) - m_sectorField=""; // from ATHENA's reconstruction.py - - m_localDetElement=""; // from ATHENA's reconstruction.py (i.e. not defined there) - u_localDetFields={}; // from ATHENA's reconstruction.py (i.e. not defined there) - -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:thresholdFactor", m_thresholdFactor); - app->SetDefaultParameter("ZDC:thresholdValue", m_thresholdValue); - app->SetDefaultParameter("ZDC:samplingFraction", m_sampFrac); - m_geoSvc = app->template GetService(); // TODO: implement named geometry service? - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - rawhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(hits); - hits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // CalorimeterHit_factory_HcalEndcapNRecHits_h_ diff --git a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPInsertRecHits.h b/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPInsertRecHits.h deleted file mode 100644 index b89c4dacde..0000000000 --- a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPInsertRecHits.h +++ /dev/null @@ -1,94 +0,0 @@ - -#ifndef CalorimeterHit_factory_HcalEndcapPInsertRecHits_h_ -#define CalorimeterHit_factory_HcalEndcapPInsertRecHits_h_ - -#include - -#include -#include -#include - -class CalorimeterHit_factory_HcalEndcapPInsertRecHits : public JFactoryT, CalorimeterHitReco { - -public: - //------------------------------------------ - // Constructor - CalorimeterHit_factory_HcalEndcapPInsertRecHits(){ - SetTag("HcalEndcapPInsertRecHits"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - - m_input_tag = "HcalEndcapPInsertRawHits"; - - // 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_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}; - - // energy correction with sampling fraction - m_sampFrac=0.998;//{this, "samplingFraction", 1.0}; - - // geometry service to get ids, ignored if no names provided - m_geoSvcName="geoServiceName"; - m_readout="HcalEndcapPInsertHits"; // from ATHENA's reconstruction.py - m_layerField=""; // from ATHENA's reconstruction.py (i.e. not defined there) - m_sectorField="sector"; // from ATHENA's reconstruction.py - - m_localDetElement=""; // from ATHENA's reconstruction.py (i.e. not defined there) - u_localDetFields={}; // from ATHENA's reconstruction.py (i.e. not defined there) - -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:thresholdFactor", m_thresholdFactor); - app->SetDefaultParameter("ZDC:thresholdValue", m_thresholdValue); - app->SetDefaultParameter("ZDC:samplingFraction", m_sampFrac); - m_geoSvc = app->template GetService(); // TODO: implement named geometry service? - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - rawhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(hits); - hits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // CalorimeterHit_factory_HcalEndcapPInsertRecHits_h_ diff --git a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPRecHits.h b/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPRecHits.h deleted file mode 100644 index 95032c2294..0000000000 --- a/src/detectors/HCAL/tmp2/CalorimeterHit_factory_HcalEndcapPRecHits.h +++ /dev/null @@ -1,94 +0,0 @@ - -#ifndef CalorimeterHit_factory_HcalEndcapPRecHits_h_ -#define CalorimeterHit_factory_HcalEndcapPRecHits_h_ - -#include - -#include -#include -#include - -class CalorimeterHit_factory_HcalEndcapPRecHits : public JFactoryT, CalorimeterHitReco { - -public: - //------------------------------------------ - // Constructor - CalorimeterHit_factory_HcalEndcapPRecHits(){ - SetTag("HcalEndcapPRecHits"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - - m_input_tag = "HcalEndcapPRawHits"; - - // 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_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}; - - // energy correction with sampling fraction - m_sampFrac=0.998;//{this, "samplingFraction", 1.0}; - - // geometry service to get ids, ignored if no names provided - m_geoSvcName="geoServiceName"; - m_readout="HcalEndcapPHits"; // from ATHENA's reconstruction.py - m_layerField=""; // from ATHENA's reconstruction.py (i.e. not defined there) - m_sectorField="sector"; // from ATHENA's reconstruction.py - - m_localDetElement=""; // from ATHENA's reconstruction.py (i.e. not defined there) - u_localDetFields={}; // from ATHENA's reconstruction.py (i.e. not defined there) - -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:thresholdFactor", m_thresholdFactor); - app->SetDefaultParameter("ZDC:thresholdValue", m_thresholdValue); - app->SetDefaultParameter("ZDC:samplingFraction", m_sampFrac); - m_geoSvc = app->template GetService(); // TODO: implement named geometry service? - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - rawhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(hits); - hits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // CalorimeterHit_factory_HcalEndcapPRecHits_h_ diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelClusters.h deleted file mode 100644 index fee6795dfb..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelClusters.h +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _Cluster_factory_HcalBarrelClusters_h_ -#define _Cluster_factory_HcalBarrelClusters_h_ - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelClusters(){ - SetTag("HcalBarrelClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- 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_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("HCAL:HcalBarrelClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("HCAL:HcalBarrelClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - -#endif // _Cluster_factory_HcalBarrelClusters_h_ diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedClusters.h deleted file mode 100644 index d31fad81a9..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelMergedClusters(){ - SetTag("HcalBarrelMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalBarrelClusters"; - m_inputAssociations_tag="HcalBarrelClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedTruthClusters.h deleted file mode 100644 index f4c69fe767..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelMergedTruthClusters(){ - SetTag("HcalBarrelMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalBarrelTruthClusters"; - m_inputAssociations_tag="HcalBarrelTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelTruthClusters.h deleted file mode 100644 index c072f76a9f..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalBarrelTruthClusters.h +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelTruthClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelTruthClusters(){ - SetTag("HcalBarrelTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalBarrelHits"; - m_input_protoclust_tag="HcalBarrelTruthProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("HCAL:HcalBarrelTruthClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelTruthClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNClusters.h deleted file mode 100644 index 75253c5318..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNClusters.h +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _Cluster_factory_HcalEndcapNClusters_h_ -#define _Cluster_factory_HcalEndcapNClusters_h_ - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNClusters(){ - SetTag("HcalEndcapNClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapNHits"; - m_input_protoclust_tag="HcalEndcapNIslandProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapNClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - -#endif // _Cluster_factory_HcalEndcapNClusters_h_ diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedClusters.h deleted file mode 100644 index af85ef6a67..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNMergedClusters(){ - SetTag("HcalEndcapNMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapNClusters"; - m_inputAssociations_tag="HcalEndcapNClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedTruthClusters.h deleted file mode 100644 index de34ce4813..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNMergedTruthClusters(){ - SetTag("HcalEndcapNMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapNTruthClusters"; - m_inputAssociations_tag="HcalEndcapNTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNTruthClusters.h deleted file mode 100644 index dd46085fe5..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapNTruthClusters.h +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNTruthClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNTruthClusters(){ - SetTag("HcalEndcapNTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapNHits"; - m_input_protoclust_tag="HcalEndcapNTruthProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapNTruthClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNTruthClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPClusters.h deleted file mode 100644 index 71a7de6080..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPClusters.h +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _Cluster_factory_HcalEndcapPClusters_h_ -#define _Cluster_factory_HcalEndcapPClusters_h_ - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPClusters(){ - SetTag("HcalEndcapPClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapPHits"; - m_input_protoclust_tag="HcalEndcapPIslandProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapPClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - -#endif // _Cluster_factory_HcalEndcapPClusters_h_ diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertClusters.h deleted file mode 100644 index ed1253b489..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertClusters.h +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _Cluster_factory_HcalEndcapPInsertClusters_h_ -#define _Cluster_factory_HcalEndcapPInsertClusters_h_ - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertClusters(){ - SetTag("HcalEndcapPInsertClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapPInsertHits"; - m_input_protoclust_tag="HcalEndcapPInsertIslandProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - -#endif // _Cluster_factory_HcalEndcapPInsertClusters_h_ diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedClusters.h deleted file mode 100644 index e55a895273..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertMergedClusters(){ - SetTag("HcalEndcapPInsertMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPInsertClusters"; - m_inputAssociations_tag="HcalEndcapPInsertClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h deleted file mode 100644 index 658fd30804..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertMergedTruthClusters(){ - SetTag("HcalEndcapPInsertMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPInsertTruthClusters"; - m_inputAssociations_tag="HcalEndcapPInsertTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertTruthClusters.h deleted file mode 100644 index e0a3348421..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPInsertTruthClusters.h +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertTruthClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertTruthClusters(){ - SetTag("HcalEndcapPInsertTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapPInsertHits"; - m_input_protoclust_tag="HcalEndcapPInsertTruthProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapPInsertTruthClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertTruthClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedClusters.h deleted file mode 100644 index 4244c65fe4..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPMergedClusters(){ - SetTag("HcalEndcapPMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPClusters"; - m_inputAssociations_tag="HcalEndcapPClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedTruthClusters.h deleted file mode 100644 index e0173fd5cf..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPMergedTruthClusters(){ - SetTag("HcalEndcapPMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPTruthClusters"; - m_inputAssociations_tag="HcalEndcapPTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPTruthClusters.h b/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPTruthClusters.h deleted file mode 100644 index e967140b76..0000000000 --- a/src/detectors/HCAL/tmp2/Cluster_factory_HcalEndcapPTruthClusters.h +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPTruthClusters : public JFactoryT, CalorimeterClusterRecoCoG { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPTruthClusters(){ - SetTag("HcalEndcapPTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_simhit_tag="HcalEndcapPHits"; - m_input_protoclust_tag="HcalEndcapPTruthProtoClusters"; - - m_sampFrac=1.0;//{this, "samplingFraction", 1.0}; - m_logWeightBase=3.6;//{this, "logWeightBase", 3.6}; - m_depthCorrection=0.0;//{this, "depthCorrection", 0.0}; - m_energyWeight="log";//{this, "energyWeight", "log"}; - m_moduleDimZName="";//{this, "moduleDimZName", ""}; - // Constrain the cluster position eta to be within - // the eta of the contributing hits. This is useful to avoid edge effects - // for endcaps. - m_enableEtaBounds=false;//{this, "enableEtaBounds", false}; - - - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:samplingFraction", m_sampFrac); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:logWeightBase", m_logWeightBase); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:depthCorrection", m_depthCorrection); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:input_simhit_tag", m_input_simhit_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:input_protoclust_tag", m_input_protoclust_tag); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:energyWeight", m_energyWeight); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:moduleDimZName", m_moduleDimZName); - app->SetDefaultParameter("ZDC:HcalEndcapPTruthClusters:enableEtaBounds", m_enableEtaBounds); - - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputSimhits=event->Get(m_input_simhit_tag); - m_inputProto=event->Get(m_input_protoclust_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - - //outputs - - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPTruthClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } -}; - diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelIslandProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelIslandProtoClusters.h deleted file mode 100644 index 44fe4522c3..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelIslandProtoClusters.h +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _ProtoCLuster_factory_HcalBarrelIslandProtoClusters_h_ -#define _ProtoCLuster_factory_HcalBarrelIslandProtoClusters_h_ - -#include - -#include -#include -#include -#include -#include - -class ProtoCluster_factory_HcalBarrelIslandProtoClusters : public JFactoryT, CalorimeterIslandCluster { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalBarrelIslandProtoClusters(){ - SetTag("HcalBarrelIslandProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_input_tag = "HcalBarrelRecHits"; - - 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 - - // neighbour checking distances - m_sectorDist=5.0 * dd4hep::cm; // from ATHENA reconstruction.py - u_localDistXY={}; //{this, "localDistXY", {}}; - u_localDistXZ={}; //{this, "localDistXZ", {}}; - u_localDistYZ={}; //{this, "localDistYZ", {}}; - u_globalDistRPhi={}; //{this, "globalDistRPhi", {}}; - u_globalDistEtaPhi={};//{this, "globalDistEtaPhi", {}}; - u_dimScaledLocalDistXY={50.0*dd4hep::mm, 50.0*dd4hep::mm};// from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json - - - app->SetDefaultParameter("HCAL:splitCluster", m_splitCluster); - app->SetDefaultParameter("HCAL:minClusterHitEdep", m_minClusterHitEdep); - app->SetDefaultParameter("HCAL:minClusterCenterEdep", m_minClusterCenterEdep); - //app->SetDefaultParameter("HCAL:inputHitCollection", m_inputHitCollection); - //app->SetDefaultParameter("HCAL:outputProtoClusterCollection", m_outputProtoCollection); - app->SetDefaultParameter("HCAL:sectorDist", m_sectorDist); - app->SetDefaultParameter("HCAL:localDistXY", u_localDistXY); - app->SetDefaultParameter("HCAL:localDistXZ", u_localDistXZ); - app->SetDefaultParameter("HCAL:localDistYZ", u_localDistYZ); - app->SetDefaultParameter("HCAL:globalDistRPhi", u_globalDistRPhi); - app->SetDefaultParameter("HCAL:globalDistEtaPhi", u_globalDistEtaPhi); - app->SetDefaultParameter("HCAL:dimScaledLocalDistXY", u_dimScaledLocalDistXY); - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - hits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(protoClusters); - protoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalBarrelIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelTruthProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelTruthProtoClusters.h deleted file mode 100644 index 41ca99a309..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalBarrelTruthProtoClusters.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _TruthCluster_factory_HcalBarrelTruthProtoClusters_h_ -#define _TruthCluster_factory_HcalBarrelTruthProtoClusters_h_ - -#include - -#include -#include -#include - - - -class ProtoCluster_factory_HcalBarrelTruthProtoClusters : public JFactoryT, CalorimeterTruthClustering { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalBarrelTruthProtoClusters(){ - SetTag("HcalBarrelTruthProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_inputHit_tag="HcalBarrelRecHits"; - m_inputMCHit_tag="HcalBarrelHits"; - - AlgorithmInit(); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - m_inputHits = event->Get(m_inputHit_tag); - m_mcHits = event->Get(m_inputMCHit_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(m_outputProtoClusters); - m_outputProtoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalBarrelIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNIslandProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNIslandProtoClusters.h deleted file mode 100644 index 6e35dbe58c..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNIslandProtoClusters.h +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _ProtoCLuster_factory_HcalEndcapNIslandProtoClusters_h_ -#define _ProtoCLuster_factory_HcalEndcapNIslandProtoClusters_h_ - -#include - -#include -#include -#include -#include -#include - -class ProtoCluster_factory_HcalEndcapNIslandProtoClusters : public JFactoryT, CalorimeterIslandCluster { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapNIslandProtoClusters(){ - SetTag("HcalEndcapNIslandProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_input_tag = "HcalEndcapNRecHits"; - - 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 - - // neighbour checking distances - m_sectorDist=5.0 * dd4hep::cm; // from ATHENA reconstruction.py - u_localDistXY={}; //{this, "localDistXY", {}}; - u_localDistXZ={}; //{this, "localDistXZ", {}}; - u_localDistYZ={}; //{this, "localDistYZ", {}}; - u_globalDistRPhi={}; //{this, "globalDistRPhi", {}}; - u_globalDistEtaPhi={};//{this, "globalDistEtaPhi", {}}; - u_dimScaledLocalDistXY={50.0*dd4hep::mm, 50.0*dd4hep::mm};// from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json - - - app->SetDefaultParameter("ZDC:splitCluster", m_splitCluster); - app->SetDefaultParameter("ZDC:minClusterHitEdep", m_minClusterHitEdep); - app->SetDefaultParameter("ZDC:minClusterCenterEdep", m_minClusterCenterEdep); - //app->SetDefaultParameter("ZDC:inputHitCollection", m_inputHitCollection); - //app->SetDefaultParameter("ZDC:outputProtoClusterCollection", m_outputProtoCollection); - app->SetDefaultParameter("ZDC:sectorDist", m_sectorDist); - app->SetDefaultParameter("ZDC:localDistXY", u_localDistXY); - app->SetDefaultParameter("ZDC:localDistXZ", u_localDistXZ); - app->SetDefaultParameter("ZDC:localDistYZ", u_localDistYZ); - app->SetDefaultParameter("ZDC:globalDistRPhi", u_globalDistRPhi); - app->SetDefaultParameter("ZDC:globalDistEtaPhi", u_globalDistEtaPhi); - app->SetDefaultParameter("ZDC:dimScaledLocalDistXY", u_dimScaledLocalDistXY); - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - hits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(protoClusters); - protoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapNIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNTruthProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNTruthProtoClusters.h deleted file mode 100644 index d30d48d36f..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapNTruthProtoClusters.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _TruthCluster_factory_HcalEndcapNTruthProtoClusters_h_ -#define _TruthCluster_factory_HcalEndcapNTruthProtoClusters_h_ - -#include - -#include -#include -#include - - - -class ProtoCluster_factory_HcalEndcapNTruthProtoClusters : public JFactoryT, CalorimeterTruthClustering { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapNTruthProtoClusters(){ - SetTag("HcalEndcapNTruthProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_inputHit_tag="HcalEndcapNRecHits"; - m_inputMCHit_tag="HcalEndcapNHits"; - - AlgorithmInit(); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - m_inputHits = event->Get(m_inputHit_tag); - m_mcHits = event->Get(m_inputMCHit_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(m_outputProtoClusters); - m_outputProtoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapNIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters.h deleted file mode 100644 index 20eda97000..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters.h +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _ProtoCLuster_factory_HcalEndcapPInsertIslandProtoClusters_h_ -#define _ProtoCLuster_factory_HcalEndcapPInsertIslandProtoClusters_h_ - -#include - -#include -#include -#include -#include -#include - -class ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters : public JFactoryT, CalorimeterIslandCluster { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapPInsertIslandProtoClusters(){ - SetTag("HcalEndcapPInsertIslandProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_input_tag = "HcalEndcapPInsertRecHits"; - - 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 - - // neighbour checking distances - m_sectorDist=5.0 * dd4hep::cm; // from ATHENA reconstruction.py - u_localDistXY={}; //{this, "localDistXY", {}}; - u_localDistXZ={}; //{this, "localDistXZ", {}}; - u_localDistYZ={}; //{this, "localDistYZ", {}}; - u_globalDistRPhi={}; //{this, "globalDistRPhi", {}}; - u_globalDistEtaPhi={};//{this, "globalDistEtaPhi", {}}; - u_dimScaledLocalDistXY={50.0*dd4hep::mm, 50.0*dd4hep::mm};// from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json - - - app->SetDefaultParameter("ZDC:splitCluster", m_splitCluster); - app->SetDefaultParameter("ZDC:minClusterHitEdep", m_minClusterHitEdep); - app->SetDefaultParameter("ZDC:minClusterCenterEdep", m_minClusterCenterEdep); - //app->SetDefaultParameter("ZDC:inputHitCollection", m_inputHitCollection); - //app->SetDefaultParameter("ZDC:outputProtoClusterCollection", m_outputProtoCollection); - app->SetDefaultParameter("ZDC:sectorDist", m_sectorDist); - app->SetDefaultParameter("ZDC:localDistXY", u_localDistXY); - app->SetDefaultParameter("ZDC:localDistXZ", u_localDistXZ); - app->SetDefaultParameter("ZDC:localDistYZ", u_localDistYZ); - app->SetDefaultParameter("ZDC:globalDistRPhi", u_globalDistRPhi); - app->SetDefaultParameter("ZDC:globalDistEtaPhi", u_globalDistEtaPhi); - app->SetDefaultParameter("ZDC:dimScaledLocalDistXY", u_dimScaledLocalDistXY); - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - hits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(protoClusters); - protoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapPInsertIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertTruthProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertTruthProtoClusters.h deleted file mode 100644 index 33b8be1719..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPInsertTruthProtoClusters.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _TruthCluster_factory_HcalEndcapPInsertTruthProtoClusters_h_ -#define _TruthCluster_factory_HcalEndcapPInsertTruthProtoClusters_h_ - -#include - -#include -#include -#include - - - -class ProtoCluster_factory_HcalEndcapPInsertTruthProtoClusters : public JFactoryT, CalorimeterTruthClustering { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapPInsertTruthProtoClusters(){ - SetTag("HcalEndcapPInsertTruthProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_inputHit_tag="HcalEndcapPInsertRecHits"; - m_inputMCHit_tag="HcalEndcapPInsertHits"; - - AlgorithmInit(); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - m_inputHits = event->Get(m_inputHit_tag); - m_mcHits = event->Get(m_inputMCHit_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(m_outputProtoClusters); - m_outputProtoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapPInsertIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPIslandProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPIslandProtoClusters.h deleted file mode 100644 index 9c1af3f113..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPIslandProtoClusters.h +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _ProtoCLuster_factory_HcalEndcapPIslandProtoClusters_h_ -#define _ProtoCLuster_factory_HcalEndcapPIslandProtoClusters_h_ - -#include - -#include -#include -#include -#include -#include - -class ProtoCluster_factory_HcalEndcapPIslandProtoClusters : public JFactoryT, CalorimeterIslandCluster { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapPIslandProtoClusters(){ - SetTag("HcalEndcapPIslandProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_input_tag = "HcalEndcapPRecHits"; - - 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 - - // neighbour checking distances - m_sectorDist=5.0 * dd4hep::cm; // from ATHENA reconstruction.py - u_localDistXY={}; //{this, "localDistXY", {}}; - u_localDistXZ={}; //{this, "localDistXZ", {}}; - u_localDistYZ={}; //{this, "localDistYZ", {}}; - u_globalDistRPhi={}; //{this, "globalDistRPhi", {}}; - u_globalDistEtaPhi={};//{this, "globalDistEtaPhi", {}}; - u_dimScaledLocalDistXY={50.0*dd4hep::mm, 50.0*dd4hep::mm};// from https://eicweb.phy.anl.gov/EIC/detectors/athena/-/blob/master/calibrations/ffi_zdc.json - - - app->SetDefaultParameter("ZDC:splitCluster", m_splitCluster); - app->SetDefaultParameter("ZDC:minClusterHitEdep", m_minClusterHitEdep); - app->SetDefaultParameter("ZDC:minClusterCenterEdep", m_minClusterCenterEdep); - //app->SetDefaultParameter("ZDC:inputHitCollection", m_inputHitCollection); - //app->SetDefaultParameter("ZDC:outputProtoClusterCollection", m_outputProtoCollection); - app->SetDefaultParameter("ZDC:sectorDist", m_sectorDist); - app->SetDefaultParameter("ZDC:localDistXY", u_localDistXY); - app->SetDefaultParameter("ZDC:localDistXZ", u_localDistXZ); - app->SetDefaultParameter("ZDC:localDistYZ", u_localDistYZ); - app->SetDefaultParameter("ZDC:globalDistRPhi", u_globalDistRPhi); - app->SetDefaultParameter("ZDC:globalDistEtaPhi", u_globalDistEtaPhi); - app->SetDefaultParameter("ZDC:dimScaledLocalDistXY", u_dimScaledLocalDistXY); - m_geoSvc = app->template GetService(); - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - hits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(protoClusters); - protoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapPIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPTruthProtoClusters.h b/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPTruthProtoClusters.h deleted file mode 100644 index fa76ac80a8..0000000000 --- a/src/detectors/HCAL/tmp2/ProtoCluster_factory_HcalEndcapPTruthProtoClusters.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _TruthCluster_factory_HcalEndcapPTruthProtoClusters_h_ -#define _TruthCluster_factory_HcalEndcapPTruthProtoClusters_h_ - -#include - -#include -#include -#include - - - -class ProtoCluster_factory_HcalEndcapPTruthProtoClusters : public JFactoryT, CalorimeterTruthClustering { - -public: - //------------------------------------------ - // Constructor - ProtoCluster_factory_HcalEndcapPTruthProtoClusters(){ - SetTag("HcalEndcapPTruthProtoClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - m_inputHit_tag="HcalEndcapPRecHits"; - m_inputMCHit_tag="HcalEndcapPHits"; - - AlgorithmInit(); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - // Prefill inputs - m_inputHits = event->Get(m_inputHit_tag); - m_mcHits = event->Get(m_inputMCHit_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(m_outputProtoClusters); - m_outputProtoClusters.clear(); // not really needed, but better to not leave dangling pointers around - } -}; - -#endif // _ProtoCLuster_factory_HcalEndcapPIslandProtoClusters_h_ diff --git a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalBarrelRawHits.h b/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalBarrelRawHits.h deleted file mode 100644 index 32ecf4a48c..0000000000 --- a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalBarrelRawHits.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _RawCalorimeterHit_factory_HcalBarrelRawHits_h_ -#define _RawCalorimeterHit_factory_HcalBarrelRawHits_h_ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -class RawCalorimeterHit_factory_HcalBarrelRawHits : public JFactoryT, CalorimeterHitDigi { - -public: - - //------------------------------------------ - // Constructor - RawCalorimeterHit_factory_HcalBarrelRawHits() { - SetTag("HcalBarrelRawHits"); - } - - //------------------------------------------ - // Init - void Init() override { - auto app = GetApplication(); - - // Set default values for all config. parameters in CalorimeterHitDigi algorithm - m_input_tag = "HcalBarrelHits"; - m_tRes = 0.0 * dd4hep::ns; - m_tRes = 0.0 * dd4hep::ns; - m_capADC = 8096; - m_dyRangeADC = 100 * dd4hep::MeV; - m_pedMeanADC = 400; - m_pedSigmaADC = 3.2; - m_resolutionTDC = 10 * dd4hep::picosecond; - m_corrMeanScale = 1.0; - m_geoSvcName = "ActsGeometryProvider"; - m_readout = ""; - m_geoSvc = app->GetService(); // TODO: implement named geometry service? - - // This is another option for exposing the data members as JANA configuration parameters. -// app->SetDefaultParameter("HCAL:tag", m_input_tag); - app->SetDefaultParameter("HCAL:energyResolutions",u_eRes); - app->SetDefaultParameter("HCAL:timeResolution", m_tRes); - app->SetDefaultParameter("HCAL:capacityADC", m_capADC); - app->SetDefaultParameter("HCAL:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("HCAL:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("HCAL:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("HCAL:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("HCAL:scaleResponse", m_corrMeanScale); - app->SetDefaultParameter("HCAL:signalSumFields", u_fields); - app->SetDefaultParameter("HCAL:fieldRefNumbers", u_refs); - app->SetDefaultParameter("HCAL:geoServiceName", m_geoSvcName); - app->SetDefaultParameter("HCAL:readoutClass", m_readout); - - // Call Init for generic algorithm - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override { - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override { - // Prefill inputs - simhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(rawhits); - rawhits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // _RawCalorimeterHit_factory_HcalBarrelRawHits_h_ diff --git a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapNRawHits.h b/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapNRawHits.h deleted file mode 100644 index 7cf5a6346c..0000000000 --- a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapNRawHits.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _RawCalorimeterHit_factory_HcalEndcapNRawHits_h_ -#define _RawCalorimeterHit_factory_HcalEndcapNRawHits_h_ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -class RawCalorimeterHit_factory_HcalEndcapNRawHits : public JFactoryT, CalorimeterHitDigi { - -public: - - //------------------------------------------ - // Constructor - RawCalorimeterHit_factory_HcalEndcapNRawHits() { - SetTag("HcalEndcapNRawHits"); - } - - //------------------------------------------ - // Init - void Init() override { - auto app = GetApplication(); - - // Set default values for all config. parameters in CalorimeterHitDigi algorithm - m_input_tag = "HcalEndcapNHits"; - m_tRes = 0.0 * dd4hep::ns; - m_tRes = 0.0 * dd4hep::ns; - m_capADC = 8096; - m_dyRangeADC = 100 * dd4hep::MeV; - m_pedMeanADC = 400; - m_pedSigmaADC = 3.2; - m_resolutionTDC = 10 * dd4hep::picosecond; - m_corrMeanScale = 1.0; - m_geoSvcName = "ActsGeometryProvider"; - m_readout = ""; - m_geoSvc = app->GetService(); // TODO: implement named geometry service? - - // This is another option for exposing the data members as JANA configuration parameters. -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:energyResolutions",u_eRes); - app->SetDefaultParameter("ZDC:timeResolution", m_tRes); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:scaleResponse", m_corrMeanScale); - app->SetDefaultParameter("ZDC:signalSumFields", u_fields); - app->SetDefaultParameter("ZDC:fieldRefNumbers", u_refs); - app->SetDefaultParameter("ZDC:geoServiceName", m_geoSvcName); - app->SetDefaultParameter("ZDC:readoutClass", m_readout); - - // Call Init for generic algorithm - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override { - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override { - // Prefill inputs - simhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(rawhits); - rawhits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // _RawCalorimeterHit_factory_HcalEndcapNRawHits_h_ diff --git a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPInsertRawHits.h b/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPInsertRawHits.h deleted file mode 100644 index 2629e1016e..0000000000 --- a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPInsertRawHits.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _RawCalorimeterHit_factory_HcalEndcapPInsertRawHits_h_ -#define _RawCalorimeterHit_factory_HcalEndcapPInsertRawHits_h_ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -class RawCalorimeterHit_factory_HcalEndcapPInsertRawHits : public JFactoryT, CalorimeterHitDigi { - -public: - - //------------------------------------------ - // Constructor - RawCalorimeterHit_factory_HcalEndcapPInsertRawHits() { - SetTag("HcalEndcapPInsertRawHits"); - } - - //------------------------------------------ - // Init - void Init() override { - auto app = GetApplication(); - - // Set default values for all config. parameters in CalorimeterHitDigi algorithm - m_input_tag = "HcalEndcapPInsertHits"; - m_tRes = 0.0 * dd4hep::ns; - m_tRes = 0.0 * dd4hep::ns; - m_capADC = 8096; - m_dyRangeADC = 100 * dd4hep::MeV; - m_pedMeanADC = 400; - m_pedSigmaADC = 3.2; - m_resolutionTDC = 10 * dd4hep::picosecond; - m_corrMeanScale = 1.0; - m_geoSvcName = "ActsGeometryProvider"; - m_readout = ""; - m_geoSvc = app->GetService(); // TODO: implement named geometry service? - - // This is another option for exposing the data members as JANA configuration parameters. -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:energyResolutions",u_eRes); - app->SetDefaultParameter("ZDC:timeResolution", m_tRes); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:scaleResponse", m_corrMeanScale); - app->SetDefaultParameter("ZDC:signalSumFields", u_fields); - app->SetDefaultParameter("ZDC:fieldRefNumbers", u_refs); - app->SetDefaultParameter("ZDC:geoServiceName", m_geoSvcName); - app->SetDefaultParameter("ZDC:readoutClass", m_readout); - - // Call Init for generic algorithm - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override { - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override { - // Prefill inputs - simhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(rawhits); - rawhits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // _RawCalorimeterHit_factory_HcalEndcapPInsertRawHits_h_ diff --git a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPRawHits.h b/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPRawHits.h deleted file mode 100644 index 564278a020..0000000000 --- a/src/detectors/HCAL/tmp2/RawCalorimeterHit_factory_HcalEndcapPRawHits.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// - -#ifndef _RawCalorimeterHit_factory_HcalEndcapPRawHits_h_ -#define _RawCalorimeterHit_factory_HcalEndcapPRawHits_h_ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -class RawCalorimeterHit_factory_HcalEndcapPRawHits : public JFactoryT, CalorimeterHitDigi { - -public: - - //------------------------------------------ - // Constructor - RawCalorimeterHit_factory_HcalEndcapPRawHits() { - SetTag("HcalEndcapPRawHits"); - } - - //------------------------------------------ - // Init - void Init() override { - auto app = GetApplication(); - - // Set default values for all config. parameters in CalorimeterHitDigi algorithm - m_input_tag = "HcalEndcapPHits"; - m_tRes = 0.0 * dd4hep::ns; - m_tRes = 0.0 * dd4hep::ns; - m_capADC = 8096; - m_dyRangeADC = 100 * dd4hep::MeV; - m_pedMeanADC = 400; - m_pedSigmaADC = 3.2; - m_resolutionTDC = 10 * dd4hep::picosecond; - m_corrMeanScale = 1.0; - m_geoSvcName = "ActsGeometryProvider"; - m_readout = ""; - m_geoSvc = app->GetService(); // TODO: implement named geometry service? - - // This is another option for exposing the data members as JANA configuration parameters. -// app->SetDefaultParameter("ZDC:tag", m_input_tag); - app->SetDefaultParameter("ZDC:energyResolutions",u_eRes); - app->SetDefaultParameter("ZDC:timeResolution", m_tRes); - app->SetDefaultParameter("ZDC:capacityADC", m_capADC); - app->SetDefaultParameter("ZDC:dynamicRangeADC", m_dyRangeADC); - app->SetDefaultParameter("ZDC:pedestalMean", m_pedMeanADC); - app->SetDefaultParameter("ZDC:pedestalSigma", m_pedSigmaADC); - app->SetDefaultParameter("ZDC:resolutionTDC", m_resolutionTDC); - app->SetDefaultParameter("ZDC:scaleResponse", m_corrMeanScale); - app->SetDefaultParameter("ZDC:signalSumFields", u_fields); - app->SetDefaultParameter("ZDC:fieldRefNumbers", u_refs); - app->SetDefaultParameter("ZDC:geoServiceName", m_geoSvcName); - app->SetDefaultParameter("ZDC:readoutClass", m_readout); - - // Call Init for generic algorithm - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override { - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override { - // Prefill inputs - simhits = event->Get(m_input_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - // Hand owner of algorithm objects over to JANA - Set(rawhits); - rawhits.clear(); // not really needed, but better to not leave dangling pointers around - } - -}; - -#endif // _RawCalorimeterHit_factory_HcalEndcapPRawHits_h_ diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedClusters.h deleted file mode 100644 index d31fad81a9..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelMergedClusters(){ - SetTag("HcalBarrelMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalBarrelClusters"; - m_inputAssociations_tag="HcalBarrelClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedTruthClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedTruthClusters.h deleted file mode 100644 index f4c69fe767..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalBarrelMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalBarrelMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalBarrelMergedTruthClusters(){ - SetTag("HcalBarrelMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalBarrelTruthClusters"; - m_inputAssociations_tag="HcalBarrelTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalBarrelMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedClusters.h deleted file mode 100644 index af85ef6a67..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNMergedClusters(){ - SetTag("HcalEndcapNMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapNClusters"; - m_inputAssociations_tag="HcalEndcapNClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedTruthClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedTruthClusters.h deleted file mode 100644 index de34ce4813..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapNMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapNMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapNMergedTruthClusters(){ - SetTag("HcalEndcapNMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapNTruthClusters"; - m_inputAssociations_tag="HcalEndcapNTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapNMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedClusters.h deleted file mode 100644 index e55a895273..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertMergedClusters(){ - SetTag("HcalEndcapPInsertMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPInsertClusters"; - m_inputAssociations_tag="HcalEndcapPInsertClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h deleted file mode 100644 index 658fd30804..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPInsertMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPInsertMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPInsertMergedTruthClusters(){ - SetTag("HcalEndcapPInsertMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPInsertTruthClusters"; - m_inputAssociations_tag="HcalEndcapPInsertTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPInsertMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedClusters.h deleted file mode 100644 index 4244c65fe4..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPMergedClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPMergedClusters(){ - SetTag("HcalEndcapPMergedClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPClusters"; - m_inputAssociations_tag="HcalEndcapPClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedTruthClusters.h b/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedTruthClusters.h deleted file mode 100644 index e0173fd5cf..0000000000 --- a/src/detectors/HCAL/unused/Cluster_factory_HcalEndcapPMergedTruthClusters.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2022, Thomas Britton -// Subject to the terms in the LICENSE file found in the top-level directory. -// -#pragma once - -#include - -#include -#include -#include -#include -#include - - - -class Cluster_factory_HcalEndcapPMergedTruthClusters : public JFactoryT, CalorimeterClusterMerger { - -public: - //------------------------------------------ - // Constructor - Cluster_factory_HcalEndcapPMergedTruthClusters(){ - SetTag("HcalEndcapPMergedTruthClusters"); - } - - //------------------------------------------ - // Init - void Init() override{ - auto app = GetApplication(); - //-------- Configuration Parameters ------------ - m_input_tag="HcalEndcapPTruthClusters"; - m_inputAssociations_tag="HcalEndcapPTruthClusterAssociations"; - - std::string tag=this->GetTag(); - std::shared_ptr m_log = app->GetService()->logger(tag); - - // Get log level from user parameter or default - std::string log_level_str = "info"; - auto pm = app->GetJParameterManager(); - pm->SetDefaultParameter(tag + ":LogLevel", log_level_str, "verbosity: trace, debug, info, warn, err, critical, off"); - m_log->set_level(eicrecon::ParseLogLevel(log_level_str)); - - AlgorithmInit(m_log); - } - - //------------------------------------------ - // ChangeRun - void ChangeRun(const std::shared_ptr &event) override{ - AlgorithmChangeRun(); - } - - //------------------------------------------ - // Process - void Process(const std::shared_ptr &event) override{ - - - // Prefill inputs - m_inputClusters=event->Get(m_input_tag); - m_inputAssociations=event->Get(m_inputAssociations_tag); - - // Call Process for generic algorithm - AlgorithmProcess(); - - //outputs - // Hand owner of algorithm objects over to JANA - Set(m_outputClusters); - event->Insert(m_outputAssociations, "HcalEndcapPMergedClusterAssociations"); - m_outputClusters.clear(); // not really needed, but better to not leave dangling pointers around - m_outputAssociations.clear(); - } - -private: - // Name of input data type (collection) - std::string m_input_tag; - std::string m_inputAssociations_tag; -}; - diff --git a/src/detectors/ZDC/CalorimeterHit_factory_ZDCEcalRecHits.h b/src/detectors/ZDC/CalorimeterHit_factory_ZDCEcalRecHits.h index 37909bb449..a594bb92ab 100644 --- 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, 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 index ff267c6409..98a285bd9a 100644 --- 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