Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/Cheat on MAIN
UIClCheater.java+13-11.2 -> 1.3
Update cheater

lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/Cheat
UIClCheater.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- UIClCheater.java	6 Nov 2010 17:40:32 -0000	1.2
+++ UIClCheater.java	6 Nov 2010 18:39:00 -0000	1.3
@@ -17,7 +17,7 @@
    String fstr = "UsedTracks";
    boolean analogHcal = false;
    String[] cltypes = {"Mips","Clumps","Blocks","Leftovers","Photons"};
-   int[] ncoll = {8,3,3,3,2};
+   int[] ncoll = {8,4,3,4,2};
    String[][] clcoll;
    TrackMCParticleDriver tmcpd;
    public UIClCheater(TrackMCParticleDriver x)
@@ -34,12 +34,14 @@
        clcoll[1][0] = "ClumpsInsideTreesECAL";
        clcoll[1][1] = "ClumpsInsideTreesHCAL";
        clcoll[1][2] = "ClumpsInsideTreesMCAL";
+       clcoll[1][3] = "VetoClumps";
        clcoll[2][0] = "BlocksInsideTreesECAL";
        clcoll[2][1] = "BlocksInsideTreesHCAL";
        clcoll[2][2] = "BlocksInsideTreesMCAL";
        clcoll[3][0] = "LeftoverHitsInsideTreesECAL";
        clcoll[3][1] = "LeftoverHitsInsideTreesHCAL";
        clcoll[3][2] = "LeftoverHitsInsideTreesMCAL";
+       clcoll[3][3] = "VetoLeftovers";
        clcoll[4][0] = "PhotonClustersForDTree";
        clcoll[4][1] = "ElectronMapClusters";
       tmcpd = x;
@@ -70,6 +72,16 @@
       Map<Track,Cluster> mutcm = (Map<Track,Cluster>) (event.get("MuonTrackClusterMap"));
       List<Cluster> mucl = new ArrayList<Cluster>(mutcm.values());
       event.put("MuonClusters",mucl);
+      List<Cluster> veto = event.get(Cluster.class,"VetoedPhotonClustersMinusMuonHitsAndMipHits");
+      List<Cluster> vc = new ArrayList<Cluster>();
+      List<Cluster> vl = new ArrayList<Cluster>();
+      for(Cluster c:veto)
+      {
+          if(c.getCalorimeterHits().size() < 5)vl.add(c);
+          else vc.add(c);
+      }
+      event.put("VetoClumps", vc);
+      event.put("VetoLeftovers", vl);
       ClusterPurityPlots cpp = new ClusterPurityPlots(fs,fst);
       List<Cluster> allc = new ArrayList<Cluster>();
       for(int i=0;i<cltypes.length;i++)
CVSspam 0.2.8