diff --git a/.github/janadot.groups b/.github/janadot.groups index 559a1ee636..4e09795512 100644 --- a/.github/janadot.groups +++ b/.github/janadot.groups @@ -4,7 +4,6 @@ -PJANADOT:GROUP:EcalBarrel=edm4eic::Cluster:EcalBarrelClusters,edm4eic::MCRecoClusterParticleAssociation:EcalBarrelClusterAssociations,edm4eic::Cluster:EcalBarrelTruthClusters,edm4eic::MCRecoClusterParticleAssociation:EcalBarrelTruthClusterAssociations,color_blue -PJANADOT:GROUP:Ecal=edm4eic::Cluster:EcalClusters,edm4eic::MCRecoClusterParticleAssociation:EcalClusterAssociations,color_blue -PJANADOT:GROUP:EcalEndcapP=edm4hep::SimCalorimeterHit:EcalEndcapPHits,edm4hep::RawCalorimeterHit:EcalEndcapPRawHits,edm4eic::CalorimeterHit:EcalEndcapPRecHits,edm4eic::ProtoCluster:EcalEndcapPIslandProtoClusters,edm4eic::Cluster:EcalEndcapPClusters,edm4eic::MCRecoClusterParticleAssociation:EcalEndcapPClusterAssociations,edm4eic::ProtoCluster:EcalEndcapPTruthProtoClusters,edm4eic::Cluster:EcalEndcapPTruthClusters,edm4eic::MCRecoClusterParticleAssociation:EcalEndcapPTruthClusterAssociations,color_blue --PJANADOT:GROUP:EcalEndcapPInsert=edm4hep::SimCalorimeterHit:EcalEndcapPInsertHits,edm4hep::RawCalorimeterHit:EcalEndcapPInsertRawHits,edm4eic::CalorimeterHit:EcalEndcapPInsertRecHits,edm4eic::ProtoCluster:EcalEndcapPInsertIslandProtoClusters,edm4eic::Cluster:EcalEndcapPInsertClusters,edm4eic::MCRecoClusterParticleAssociation:EcalEndcapPInsertClusterAssociations,edm4eic::ProtoCluster:EcalEndcapPInsertTruthProtoClusters,edm4eic::Cluster:EcalEndcapPInsertTruthClusters,edm4eic::MCRecoClusterParticleAssociation:EcalEndcapPInsertTruthClusterAssociations,color_blue -PJANADOT:GROUP:B0Ecal=edm4hep::SimCalorimeterHit:B0ECalHits,edm4hep::RawCalorimeterHit:B0ECalRawHits,edm4eic::CalorimeterHit:B0ECalRecHits,edm4eic::ProtoCluster:B0ECalIslandProtoClusters,edm4eic::Cluster:B0ECalClusters,edm4eic::MCRecoClusterParticleAssociation:B0ECalClusterAssociations,color_blue -PJANADOT:GROUP:EcalFarForwardZDC=edm4hep::SimCalorimeterHit:EcalFarForwardZDCHits,edm4hep::RawCalorimeterHit:EcalFarForwardZDCRawHits,edm4eic::CalorimeterHit:EcalFarForwardZDCRecHits,edm4eic::CalorimeterHit:EcalFarForwardZDCSubcellHits,edm4eic::ProtoCluster:EcalFarForwardZDCImagingProtoClusters,edm4eic::ProtoCluster:EcalFarForwardZDCIslandProtoClusters,edm4eic::Cluster:EcalFarForwardZDCClusters,edm4eic::MCRecoClusterParticleAssociation:EcalFarForwardZDCClusterAssociations,edm4eic::ProtoCluster:EcalFarForwardZDCTruthProtoClusters,edm4eic::Cluster:EcalFarForwardZDCTruthClusters,edm4eic::MCRecoClusterParticleAssociation:EcalFarForwardZDCTruthClusterAssociations,color_red -PJANADOT:GROUP:EcalLumiSpec=edm4hep::SimCalorimeterHit:EcalLumiSpecHits,edm4hep::RawCalorimeterHit:EcalLumiSpecRawHits,edm4eic::CalorimeterHit:EcalLumiSpecRecHits,edm4eic::CalorimeterHit:EcalLumiSpecSubcellHits,edm4eic::ProtoCluster:EcalLumiSpecImagingProtoClusters,edm4eic::ProtoCluster:EcalLumiSpecIslandProtoClusters,edm4eic::Cluster:EcalLumiSpecClusters,edm4eic::MCRecoClusterParticleAssociation:EcalLumiSpecClusterAssociations,edm4eic::ProtoCluster:EcalLumiSpecTruthProtoClusters,edm4eic::Cluster:EcalLumiSpecTruthClusters,edm4eic::MCRecoClusterParticleAssociation:EcalLumiSpecTruthClusterAssociations,color_red diff --git a/docs/howto/callgraphs/EcalEndcapPInsertMergedClusters.png b/docs/howto/callgraphs/EcalEndcapPInsertMergedClusters.png deleted file mode 100644 index b4544a3b5e..0000000000 Binary files a/docs/howto/callgraphs/EcalEndcapPInsertMergedClusters.png and /dev/null differ diff --git a/docs/howto/visualize_callgraph.md b/docs/howto/visualize_callgraph.md index fedb12af98..7ff36da775 100644 --- a/docs/howto/visualize_callgraph.md +++ b/docs/howto/visualize_callgraph.md @@ -106,7 +106,6 @@ time is just the first place where the geometry was read in. | ![EcalBarrelSciGlassMergedTruthClusters](callgraphs/EcalBarrelSciGlassMergedTruthClusters.png) | | ![EcalBarrelImagingMergedClusters](callgraphs/EcalBarrelImagingMergedClusters.png) | | ![EcalEndcapPMergedClusters](callgraphs/EcalEndcapPMergedClusters.png) | -| ![EcalEndcapPInsertMergedClusters](callgraphs/EcalEndcapPInsertMergedClusters.png) | | ![EcalEndcapNMergedClusters](callgraphs/EcalEndcapNMergedClusters.png) | | ![ForwardRomanPotParticles](callgraphs/ForwardRomanPotParticles.png) | | ![HcalBarrelClusters](callgraphs/HcalBarrelClusters.png) | diff --git a/src/detectors/FEMC/FEMC.cc b/src/detectors/FEMC/FEMC.cc index 87c539d7d6..ba968b828d 100644 --- a/src/detectors/FEMC/FEMC.cc +++ b/src/detectors/FEMC/FEMC.cc @@ -185,128 +185,5 @@ void InitPlugin(JApplication* app) { "EcalEndcapPSplitMergeClusterAssociationsWithoutShapes"}, {"EcalEndcapPSplitMergeClusters", "EcalEndcapPSplitMergeClusterAssociations"}, {.energyWeight = "log", .logWeightBase = 3.6}, app)); - - // Insert is identical to regular Ecal - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertRawHits", {"EcalEndcapPInsertHits"}, -#if EDM4EIC_VERSION_MAJOR >= 7 - {"EcalEndcapPInsertRawHits", "EcalEndcapPInsertRawHitAssociations"}, -#else - {"EcalEndcapPInsertRawHits"}, -#endif - { - .eRes = {0.11333 * sqrt(dd4hep::GeV), 0.03, - 0.0 * dd4hep::GeV}, // (11.333% / sqrt(E)) \oplus 3% - .tRes = 0.0, - .threshold = 0.0, - // .threshold = 15 * dd4hep::MeV for a single tower, applied on ADC level - .capADC = EcalEndcapP_capADC, - .capTime = 100, // given in ns, 4 samples in HGCROC - .dyRangeADC = EcalEndcapP_dyRangeADC, - .pedMeanADC = EcalEndcapP_pedMeanADC, - .pedSigmaADC = EcalEndcapP_pedSigmaADC, - .resolutionTDC = EcalEndcapP_resolutionTDC, - .corrMeanScale = "0.03", - .readout = "EcalEndcapPInsertHits", - }, - app // TODO: Remove me once fixed - )); - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertRecHits", {"EcalEndcapPInsertRawHits"}, {"EcalEndcapPInsertRecHits"}, - { - .capADC = EcalEndcapP_capADC, - .dyRangeADC = EcalEndcapP_dyRangeADC, - .pedMeanADC = EcalEndcapP_pedMeanADC, - .pedSigmaADC = EcalEndcapP_pedSigmaADC, - .resolutionTDC = EcalEndcapP_resolutionTDC, - .thresholdFactor = 0.0, - .thresholdValue = - 2, // The ADC of a 15 MeV particle is adc = 200 + 15 * 0.03 * ( 1.0 + 0) / 3000 * 16384 = 200 + 2.4576 - .sampFrac = "0.03", - .readout = "EcalEndcapPInsertHits", - }, - app // TODO: Remove me once fixed - )); - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertTruthProtoClusters", {"EcalEndcapPInsertRecHits", "EcalEndcapPInsertHits"}, - {"EcalEndcapPInsertTruthProtoClusters"}, - app // TODO: Remove me once fixed - )); - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertIslandProtoClusters", {"EcalEndcapPInsertRecHits"}, - {"EcalEndcapPInsertIslandProtoClusters"}, - { - .adjacencyMatrix{}, - .peakNeighbourhoodMatrix{}, - .readout{}, - .sectorDist = 5.0 * dd4hep::cm, - .localDistXY{}, - .localDistXZ{}, - .localDistYZ{}, - .globalDistRPhi{}, - .globalDistEtaPhi{}, - .dimScaledLocalDistXY = {1.5, 1.5}, - .splitCluster = false, - .minClusterHitEdep = 0.0 * dd4hep::MeV, - .minClusterCenterEdep = 60.0 * dd4hep::MeV, - .transverseEnergyProfileMetric = "dimScaledLocalDistXY", - .transverseEnergyProfileScale = 1., - .transverseEnergyProfileScaleUnits{}, - }, - app // TODO: Remove me once fixed - )); - - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertTruthClustersWithoutShapes", - { - "EcalEndcapPInsertTruthProtoClusters", // edm4eic::ProtoClusterCollection -#if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitCollection -#else - "EcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection -#endif - {"EcalEndcapPInsertTruthClustersWithoutShapes", // edm4eic::Cluster - "EcalEndcapPInsertTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation - {.energyWeight = "log", .sampFrac = 1.0, .logWeightBase = 6.2, .enableEtaBounds = true}, - app // TODO: Remove me once fixed - )); - - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertTruthClusters", - {"EcalEndcapPInsertTruthClustersWithoutShapes", - "EcalEndcapPInsertTruthClusterAssociationsWithoutShapes"}, - {"EcalEndcapPInsertTruthClusters", "EcalEndcapPInsertTruthClusterAssociations"}, - {.energyWeight = "log", .logWeightBase = 6.2}, app)); - - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertClustersWithoutShapes", - { - "EcalEndcapPInsertIslandProtoClusters", // edm4eic::ProtoClusterCollection -#if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitCollection -#else - "EcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection -#endif - {"EcalEndcapPInsertClustersWithoutShapes", // edm4eic::Cluster - "EcalEndcapPInsertClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation - { - .energyWeight = "log", - .sampFrac = 1.0, - .logWeightBase = 3.6, - .enableEtaBounds = false, - }, - app // TODO: Remove me once fixed - )); - - app->Add(new JOmniFactoryGeneratorT( - "EcalEndcapPInsertClusters", - {"EcalEndcapPInsertClustersWithoutShapes", - "EcalEndcapPInsertClusterAssociationsWithoutShapes"}, - {"EcalEndcapPInsertClusters", "EcalEndcapPInsertClusterAssociations"}, - {.energyWeight = "log", .logWeightBase = 3.6}, app)); } } diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 63056157ed..ca51f22d22 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -253,12 +253,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "EcalEndcapPClusterAssociations", "EcalEndcapPSplitMergeClusters", "EcalEndcapPSplitMergeClusterAssociations", - "EcalEndcapPInsertRawHits", - "EcalEndcapPInsertRecHits", - "EcalEndcapPInsertTruthClusters", - "EcalEndcapPInsertTruthClusterAssociations", - "EcalEndcapPInsertClusters", - "EcalEndcapPInsertClusterAssociations", "EcalBarrelClusters", "EcalBarrelClusterAssociations", "EcalBarrelTruthClusters", @@ -350,7 +344,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "EcalEndcapNRawHitAssociations", "HcalEndcapNRawHitAssociations", "EcalEndcapPRawHitAssociations", - "EcalEndcapPInsertRawHitAssociations", "HcalEndcapPInsertRawHitAssociations", "LFHCALRawHitAssociations", "EcalLumiSpecRawHitAssociations",