adding hcal clusters after center of mass, adding gen_central_pions; fixing...

adding hcal clusters after center of mass, adding gen_central_pions; fixing name error in barrel_clusters

benchmarks/clustering/options/fullcalo_clustering.py

@@ -99,9 +99,24 @@ crystal_ec_cluster = IslandCluster("crystal_ec_cluster",
         groupRange=2.0,
         OutputLevel=DEBUG)
 
-simple_cluster = SimpleClustering("simple_cluster", 
+
+hcal_barrel_cluster = IslandCluster("hcal_barrel_cluster",
+        inputHitCollection="RecHcalBarrelHits",
+        outputClusterCollection="HcalBarrelClusters", 
+        splitHitCollection="splitHcalBarrelHitCollection",
+        minClusterCenterEdep=1*units.MeV,
+        groupRange=2.0,
+        OutputLevel=DEBUG)
+
+
+ecal_simple_cluster = SimpleClustering("ecal_simple_cluster", 
         inputHitCollection="RecEcalBarrelHits", 
-        outputClusters="SimpleClusters",
+        outputClusters="EcalSimpleClusters",
+        OutputLevel=DEBUG)
+
+hcal_simple_cluster = SimpleClustering("hcal_simple_cluster",
+        inputHitCollection="RecHcalBarrelHits",
+        outputClusters="HcalSimpleClusters",
         OutputLevel=DEBUG)
 
 # finalizing clustering (center-of-gravity step)
@@ -117,19 +132,37 @@ clusterreco = RecoCoG("cluster_reco",
         samplingFraction=sf, 
         OutputLevel=DEBUG)
 
+hcal_barrel_clusterreco = RecoCoG("hcal_barrel_clusterreco",
+        clusterCollection="HcalBarrelClusters",
+        logWeightBase=6.2,
+        samplingFraction=sf)
+
+
+
 out = PodioOutput("out", filename=output_rec_file)
 
 out.outputCommands = ["keep *"]
 
 ApplicationMgr(
-    TopAlg = [podioinput, copier, calcopier,
-              ecdigi, emcaldigi,hcaldigi,
-              crystal_ec_reco, ecal_reco, hcal_reco,  
-              #ec_barrel_cluster, crystal_ec_cluster, ec_barrel_clusterreco, clusterreco,
-              #simple_cluster,
+    TopAlg = [podioinput, copier,
+              calcopier,
+              ecdigi, 
+              emcaldigi,
+              hcaldigi,
+              crystal_ec_reco, 
+              ecal_reco, 
+              hcal_reco,  
+              ec_barrel_cluster,
+              crystal_ec_cluster, 
+              hcal_barrel_cluster, 
+              ec_barrel_clusterreco, 
+              clusterreco, 
+              hcal_barrel_clusterreco,
+              ecal_simple_cluster,
+              hcal_simple_cluster,
               out],
     EvtSel = 'NONE',
     EvtMax   = n_events,
     ExtSvc = [podioevent],
     OutputLevel=DEBUG
- )
+)