diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc index 01b9b63d56..e086abb127 100644 --- a/src/detectors/BEMC/BEMC.cc +++ b/src/detectors/BEMC/BEMC.cc @@ -92,6 +92,29 @@ extern "C" { }, app // TODO: Remove me once fixed )); + + + //====================================================================== + // Trying ImagingTopoClustering for ScFi + + app->Add(new JOmniFactoryGeneratorT( + "EcalBarrelScFiProtoClusters_Topo", {"EcalBarrelScFiRecHits"}, {"EcalBarrelScFiProtoClusters_Topo"}, + { + .neighbourLayersRange = 2, // # id diff for adjacent layer + .localDistXY = {2.0 * dd4hep::mm, 2 * dd4hep::mm}, // # same layer + .layerDistEtaPhi = {10 * dd4hep::mrad, 10 * dd4hep::mrad}, // # adjacent layer + .sectorDist = 3.0 * dd4hep::cm, + .minClusterHitEdep = 0, + .minClusterCenterEdep = 0, + .minClusterEdep = 100 * dd4hep::MeV, + .minClusterNhits = 10, + }, + app // TODO: Remove me once fixed + )); + + //====================================================================== + + app->Add( new JOmniFactoryGeneratorT( "EcalBarrelScFiClustersWithoutShapes", @@ -127,6 +150,26 @@ extern "C" { app ) ); + //====================================================================== + + app->Add( + new JOmniFactoryGeneratorT( + "EcalBarrelScFiTopoClusters", + {"EcalBarrelScFiClustersWithoutShapes", + "EcalBarrelScFiClusterAssociationsWithoutShapes"}, + {"EcalBarrelScFiTopoClusters", + "EcalBarrelScFiTopoClusterAssociations"}, + { + .longitudinalShowerInfoAvailable = true, + .energyWeight = "log", + .logWeightBase = 6.2 + }, + app + ) + ); + + //====================================================================== + // Make sure digi and reco use the same value decltype(CalorimeterHitDigiConfig::capADC) EcalBarrelImaging_capADC = 8192; //8192, 13bit ADC diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 73b9e7e923..52577e8bfd 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -266,7 +266,10 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "EcalBarrelScFiRawHits", "EcalBarrelScFiRecHits", "EcalBarrelScFiClusters", + "EcalBarrelScFiTopoClusters", // added for Imaging Topo clustering on SCFI + "EcalBarrelScFiProtoClusters_Topo", // added for Imaging Topo clustering on SCFI "EcalBarrelScFiClusterAssociations", + "EcalBarrelScFiTopoClusterAssociations", // added for Imaging Topo clustering on SCFI "EcalLumiSpecRawHits", "EcalLumiSpecRecHits", "EcalLumiSpecTruthClusters",