Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/TrackingTest on MAIN
LOIEffFake.java+26-151.2 -> 1.3
Updated with minor changes to normalized fake plot

lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/TrackingTest
LOIEffFake.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- LOIEffFake.java	4 Mar 2009 20:36:33 -0000	1.2
+++ LOIEffFake.java	9 Mar 2009 23:43:12 -0000	1.3
@@ -14,14 +14,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import java.util.Set;
 import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
 import org.lcsim.event.MCParticle;
 import org.lcsim.event.RelationalTable;
 import org.lcsim.event.Track;
-import org.lcsim.event.TrackerHit;
 import org.lcsim.event.base.BaseRelationalTable;
 import org.lcsim.fit.helicaltrack.HelicalTrackFit;
 import org.lcsim.fit.helicaltrack.HelixParamCalculator;
@@ -38,6 +36,7 @@
 
     private AIDA aida = AIDA.defaultInstance();
     private EventShape es = new EventShape();
+    private IHistogramFactory hf;
     private IHistogram1D pTeff1;
     private IHistogram1D pTeff2;
     private IHistogram1D thetaeff;
@@ -55,7 +54,7 @@
     public LOIEffFake() {
 
         //  Define the efficiency histograms
-        IHistogramFactory hf = aida.histogramFactory();
+        hf = aida.histogramFactory();
         pTeff1 = hf.createHistogram1D("Efficiency vs pT", "", 100, 0., 5., "type=efficiency");
         pTeff2 = hf.createHistogram1D("Efficiency vs pT full", "", 100, 0., 50., "type=efficiency");
         thetaeff = hf.createHistogram1D("Efficiency vs theta", "", 72, 0., 180., "type=efficiency");
@@ -66,7 +65,6 @@
         z0eff2 = hf.createHistogram1D("Efficiency vs z0 full", "", 24, -12., 12., "type=efficiency");
         thrusteff = hf.createHistogram1D("Efficiency vs alpha", "", 100, 0., 90., "type=efficiency");
         fakes = hf.createHistogram1D("Number of mis-matched hits (unnormalized)", "", 10, 0., 10.);
-        nfakes = hf.createHistogram1D("Number of mis-matched hits (normalized)", "", 10, 0., 10.);
     }
 
     @Override
@@ -81,6 +79,7 @@
 
         //  Get the list of strategies being used
         String sfile = "autogen_ttbar_sid02_vs.xml";
+//        String sfile = "sATLASFull-SM08.xml";
         List<SeedStrategy> slist = StrategyXMLUtils.getStrategyListFromResource(
                 StrategyXMLUtils.getDefaultStrategiesPrefix() + sfile);
 
@@ -391,22 +390,34 @@
                 System.out.println("**** MC Particle is not findable with all ignores set!!");
             }
         }
+
+        //  Make the normalized plot every 100 events
+        if (nevt % 100 == 0) {
+        nfakes = hf.createHistogram1D("Number of mis-matched hits (normalized)", "", 10, 0., 10.);
+            double wgt = 100. / ntrktot;
+            for (int i = 0; i < 10; i++) {
+                for (int j = 0; j < fakes.binHeight(i); j++) {
+                    nfakes.fill(i, wgt);
+                }
+            }
+        }
+
         return;
     }
 
-    @Override
-    protected void endOfData() {
+//    @Override
+//    protected void endOfData() {
 
         //  Make the normalized fake plot
-        double wgt = 100. / ntrktot;
-        for (int i = 0; i < 10; i++) {
-            System.out.println(" Entries: " + fakes.binEntries(i) + " for mismatches: " + i);
-            for (int j = 0; j < fakes.binHeight(i); j++) {
-                nfakes.fill(i, wgt);
-            }
-        }
-        System.out.println("Normalization: " + nfakes.sumAllBinHeights() + " after ntrk = " + ntrktot);
-    }
+//        double wgt = 100. / ntrktot;
+//        for (int i = 0; i < 10; i++) {
+//            System.out.println(" Entries: " + fakes.binEntries(i) + " for mismatches: " + i);
+//            for (int j = 0; j < fakes.binHeight(i); j++) {
+//                nfakes.fill(i, wgt);
+//            }
+//        }
+//        System.out.println("Normalization: " + nfakes.sumAllBinHeights() + " after ntrk = " + ntrktot);
+//   }
 
     private Hep3Vector Thrust(List<MCParticle> mclist) {
 
CVSspam 0.2.8