Resolve "Remove obsolete algorithms from full simulations"

Closes #51 (closed)

benchmarks/full/options/full_reconstruction.py

@@ -52,15 +52,12 @@ from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollectio
 from Configurables import Jug__Base__InputCopier_dd4pod__TrackerHitCollection_dd4pod__TrackerHitCollection_ as TrkCopier
 from Configurables import Jug__Base__InputCopier_dd4pod__PhotoMultiplierHitCollection_dd4pod__PhotoMultiplierHitCollection_ as PMTCopier
 
-from Configurables import Jug__Base__MC2DummyParticle as MC2DummyParticle
-
 from Configurables import Jug__Digi__PhotoMultiplierDigi as PhotoMultiplierDigi
 from Configurables import Jug__Digi__CalorimeterHitDigi as CalHitDigi
-from Configurables import Jug__Digi__ExampleCaloDigi as ExampleCaloDigi
 from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi
-from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi
 
 from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction
+from Configurables import Jug__Reco__TrackingHitsCollector2 as TrackingHitsCollector
 from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker
 from Configurables import Jug__Reco__TrackerSourcesLinker as TrackerSourcesLinker
 #from Configurables import Jug__Reco__TrackingHitsSourceLinker as TrackingHitsSourceLinker
@@ -85,8 +82,6 @@ from Configurables import Jug__Reco__PhotoRingClusters as PhotoRingClusters
 
 from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction
 
-from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
-
 # branches needed from simulation root file
 sim_coll = [
     "mcparticles",
@@ -120,29 +115,6 @@ pmtcopier = PMTCopier("PMTCopier",
         inputCollection="DRICHHits",
         outputCollection="DRICHHits2")
 
-# Dummy reconstruction
-dummy = MC2DummyParticle("MC2Dummy",
-        inputCollection="mcparticles",
-        outputCollection="ReconstructedParticles",
-        smearing = 0.01)
-
-# Simple clusters
-ecal_digi = EMCalorimeterDigi("ecal_digi",
-        inputHitCollection="EcalBarrelHits",
-        outputHitCollection="EcalBarrelHitsSimpleDigi")
-
-ecal_reco = EMCalReconstruction("ecal_reco",
-        inputHitCollection=ecal_digi.outputHitCollection,
-        outputHitCollection="EcalBarrelHitsSimpleReco",
-        minModuleEdep=0.0*units.MeV)
-
-simple_cluster = SimpleClustering("simple_cluster",
-        inputHitCollection=ecal_reco.outputHitCollection,
-        outputClusterCollection="SimpleClusters",
-        outputProtoClusterCollection="SimpleProtoClusters",
-        minModuleEdep=1.0*units.MeV,
-        maxDistance=50.0*units.cm)
-
 # Crystal Endcap Ecal
 ce_ecal_daq = dict(
         dynamicRangeADC=5.*units.GeV,
@@ -470,14 +442,24 @@ vtx_ec_reco = TrackerHitReconstruction("vtx_ec_reco",
         inputHitCollection = vtx_ec_digi.outputHitCollection,
         outputHitCollection="VertexEndcapRecHits")
 
-gem_ec_reco = TrackerHitReconstruction("gem_ec_digi",
+gem_ec_reco = TrackerHitReconstruction("gem_ec_reco",
         inputHitCollection=gem_ec_digi.outputHitCollection,
         outputHitCollection="GEMTrackerEndcapRecHits",
         timeResolution=10)
+TrackingHitsCollector
+# Tracking hit collector
+trk_hit_col = TrackingHitsCollector("trk_hit_col",
+        inputTrackingHits=[
+            str(trk_b_reco.outputHitCollection),
+            str(trk_ec_reco.outputHitCollection),
+            str(vtx_b_reco.outputHitCollection),
+            str(vtx_ec_reco.outputHitCollection),
+            str(gem_ec_reco.outputHitCollection) ],
+        trackingHits="trackingHits")
 
 # Hit Source linker
 sourcelinker = TrackerSourcesLinker("trk_srcslnkr",
-        inputHitCollections = ["VertexBarrelRecHits", "TrackerBarrelRecHits"],
+        inputHitCollections = trk_hit_col.trackingHits,
         outputSourceLinks = "TrackerSourceLinks",
         outputMeasurements = "TrackerMeasurements")
 
@@ -491,7 +473,7 @@ sourcelinker = TrackerSourcesLinker("trk_srcslnkr",
 ## Track param init
 truth_trk_init = TrackParamTruthInit("truth_trk_init",
         inputMCParticles="mcparticles",
-        outputInitialTrackParameters="InitTrackParamsFromTruth")
+        outputInitialTrackParameters="InitTrackParams")
 
 #clust_trk_init = TrackParamClusterInit("clust_trk_init",
 #        inputClusters="SimpleClusters",
@@ -507,12 +489,12 @@ truth_trk_init = TrackParamTruthInit("truth_trk_init",
 trk_find_alg = TrackFindingAlgorithm("trk_find_alg",
         inputSourceLinks = sourcelinker.outputSourceLinks,
         inputMeasurements = sourcelinker.outputMeasurements,
-        inputInitialTrackParameters = "InitTrackParamsFromTruth",
+        inputInitialTrackParameters = "InitTrackParams",
         outputTrajectories = "trajectories")
 
 parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
         inputTrajectories = "trajectories",
-        outputParticles = "ReconstructedParticlesInitFromTruth",
+        outputParticles = "ReconstructedParticles",
         outputTrackParameters = "outputTrackParameters")
 
 #trk_find_alg1 = TrackFindingAlgorithm("trk_find_alg1",
@@ -553,19 +535,19 @@ pmtreco = PhotoMultiplierReco("pmtreco",
 #        outputClusterCollection="ForwardRICHClusters")
 
 # Output
-podout.outputCommands = ["keep *",
-        "keep *Digi",
+podout.outputCommands = [
+        "keep *",
+        "drop *Digi",
         "keep *Reco*",
         "keep *ClusterHits",
         "keep *Clusters",
         "keep *Layers",
+        "drop InitTrackParams",
         "drop mcparticles"
         ]
 
 ApplicationMgr(
     TopAlg = [podin, copier, trkcopier,
-              dummy,
-              ecal_digi, ecal_reco, #simple_cluster,
               ce_ecal_digi, ce_ecal_reco, ce_ecal_cl, ce_ecal_clreco,
               ci_ecal_digi, ci_ecal_reco, ci_ecal_merger, ci_ecal_cl, ci_ecal_clreco,
               cb_ecal_digi, cb_ecal_reco, cb_ecal_cl, cb_ecal_clreco,
@@ -575,11 +557,11 @@ ApplicationMgr(
               ci_hcal_digi, ci_hcal_reco, ci_hcal_merger, ci_hcal_cl, ci_hcal_clreco,
               trk_b_digi, trk_ec_digi, vtx_b_digi, vtx_ec_digi,
               trk_b_reco, trk_ec_reco, vtx_b_reco, vtx_ec_reco,
+              trk_hit_col,
               sourcelinker, #trk_hits_srclnkr,
               #clust_trk_init,
-              truth_trk_init,
+              truth_trk_init, trk_find_alg, parts_from_fit,
               #vtxcluster_trk_init,
-              trk_find_alg, parts_from_fit,
               #trk_find_alg1, parts_from_fit1,
               #trk_find_alg2, parts_from_fit2,
               pmtcopier, pmtdigi, pmtreco, #richcluster,