Resolve "Remove obsolete algorithms from full simulations"

Closes #51 (closed)

benchmarks/full/options/full_reconstruction.py

@@ -97,7 +97,8 @@ sim_coll = [
     "GEMTrackerEndcapHits",
     "VertexBarrelHits",
     "VertexEndcapHits",
-    "DRICHHits"
+    "DRICHHits",
+    "MRICHHits"
 ]
 
 # list of algorithms
@@ -241,7 +242,7 @@ img_barrel_cl = ImagingCluster("img_barrel_cl",
         layerDistEtaPhi=[10*units.mrad, 10*units.mrad],     # adjacent layer
         neighbourLayersRange=2,                 # id diff for adjacent layer
         sectorDist=3.*units.cm)                       # different sector
-algorithms.append(cb_ecal_cl)
+algorithms.append(img_barrel_cl)
 
 img_barrel_clreco = ImagingClusterReco("img_barrel_clreco",
         samplingFraction=img_barrel_sf,
@@ -509,10 +510,10 @@ trk_hit_col = TrackingHitsCollector("trk_hit_col",
 algorithms.append(trk_hit_col)
 
 # Hit Source linker
-sourcelinker = TrackerSourcesLinker("trk_srcslnkr",
-        inputHitCollections = trk_hit_col.trackingHits,
-        outputSourceLinks = "TrackerSourceLinks",
-        outputMeasurements = "TrackerMeasurements")
+sourcelinker = TrackerSourceLinker("trk_srcslnkr",
+        inputHitCollection = trk_hit_col.trackingHits,
+        outputSourceLinks = "TrackSourceLinks",
+        outputMeasurements = "TrackMeasurements")
 algorithms.append(sourcelinker)
 
 ## Track param init
@@ -535,18 +536,38 @@ parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
         outputTrackParameters = "outputTrackParameters")
 algorithms.append(parts_from_fit)
 
-pmtdigi = PhotoMultiplierDigi("pmtdigi",
+# DRICH
+drich_digi = PhotoMultiplierDigi("drich_digi",
         inputHitCollection="DRICHHits",
         outputHitCollection="DRICHRawHits",
         quantumEfficiency=[(a*units.eV, b) for a, b in qe_data])
-algorithms.append(pmtdigi)
+algorithms.append(drich_digi)
 
-pmtreco = PhotoMultiplierReco("pmtreco",
-        inputHitCollection="DRICHHitsDigi",
-        outputHitCollection="DRICHHitsReco")
+drich_reco = PhotoMultiplierReco("drich_reco",
+        inputHitCollection=drich_digi.outputHitCollection,
+        outputHitCollection="DRICHRecHits")
+algorithms.append(drich_reco)
 
 # FIXME
-#richcluster = PhotoRingClusters("richcluster",
+#drich_cluster = PhotoRingClusters("drich_cluster",
+#        inputHitCollection=pmtreco.outputHitCollection,
+#        #inputTrackCollection="ReconstructedParticles",
+#        outputClusterCollection="ForwardRICHClusters")
+
+# MRICH
+mrich_digi = PhotoMultiplierDigi("mrich_digi",
+        inputHitCollection="MRICHHits",
+        outputHitCollection="MRICHRawHits",
+        quantumEfficiency=[(a*units.eV, b) for a, b in qe_data])
+algorithms.append(mrich_digi)
+
+mrich_reco = PhotoMultiplierReco("mrich_reco",
+        inputHitCollection=mrich_digi.outputHitCollection,
+        outputHitCollection="MRICHRecHits")
+algorithms.append(mrich_reco)
+
+# FIXME
+#mrich_cluster = PhotoRingClusters("drich_cluster",
 #        inputHitCollection=pmtreco.outputHitCollection,
 #        #inputTrackCollection="ReconstructedParticles",
 #        outputClusterCollection="ForwardRICHClusters")
@@ -561,7 +582,6 @@ podout.outputCommands = [
         "keep *Clusters",
         "keep *Layers",
         "drop InitTrackParams",
-        "drop mcparticles"
         ]
 algorithms.append(podout)