LISTSERV 16.5 - LCD-CVS Archives

+ +import org.lcsim.detector.identifier.IExpandedIdentifier; +import org.lcsim.detector.identifier.IIdentifier; +import org.lcsim.detector.identifier.IIdentifierDictionary; +import org.lcsim.detector.identifier.IIdentifierHelper;

hps-java/src/main/java/org/lcsim/hps/monitoring/svt

SVTPulseFitPlots.java 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- SVTPulseFitPlots.java	5 Jun 2013 19:03:21 -0000	1.6
+++ SVTPulseFitPlots.java	25 Oct 2013 20:14:23 -0000	1.7
@@ -1,14 +1,19 @@

 package org.lcsim.hps.monitoring.svt;

-import hep.aida.*;

+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
+

 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;

-import org.lcsim.hps.monitoring.AIDAFrame;

 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
 import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;

@@ -25,7 +30,6 @@

  */
 public class SVTPulseFitPlots extends Driver implements Resettable {

-	//private AIDAFrame plotterFrame;

     private AIDA aida = AIDA.defaultInstance();
     private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
 //    private String trackerName = "Tracker";

@@ -43,17 +47,13 @@

     private IHistogram2D[][] shape = new IHistogram2D[2][10];
 //    private IHistogram2D shape;

-    @Override

     protected void detectorChanged(Detector detector) {

-    	//plotterFrame = new AIDAFrame();
-        //plotterFrame.setTitle("HPS SVT Pulse Fit Plots");

 
         aida.tree().cd("/");
 
         IAnalysisFactory fac = aida.analysisFactory();
         plotter = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Timing Plots");
         plotter.setTitle("Timing");

-        //plotterFrame.addPlotter(plotter);

         IPlotterStyle style = plotter.style();
         style.dataStyle().fillStyle().setColor("yellow");
         style.dataStyle().errorBarStyle().setVisible(false);

@@ -61,7 +61,6 @@

 
         plotter2 = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Amplitude Plots");
         plotter2.setTitle("Amplitude");

-        //plotterFrame.addPlotter(plotter2);

         IPlotterStyle style2 = plotter2.style();
         style2.dataStyle().fillStyle().setColor("yellow");
         style2.dataStyle().errorBarStyle().setVisible(false);

@@ -69,14 +68,12 @@

 
         plotter3 = fac.createPlotterFactory("SVT Pulse Fit").create("HPS SVT Chisq Plots");
         plotter3.setTitle("Chisq");

-        //plotterFrame.addPlotter(plotter3);

         plotter3.style().dataStyle().fillStyle().setColor("yellow");
         plotter3.style().dataStyle().errorBarStyle().setVisible(false);
         plotter3.createRegions(4, 5);
 
         plotter4 = fac.createPlotterFactory("SVT Pulse Fit").create("A vs. T0");
         plotter4.setTitle("A vs. T0");

-        //plotterFrame.addPlotter(plotter4);

         plotter4.style().dataStyle().errorBarStyle().setVisible(false);
         plotter4.style().statisticsBoxStyle().setVisible(false);
         plotter4.style().setParameter("hist2DStyle", "colorMap");

@@ -87,7 +84,6 @@

 
         plotter5 = fac.createPlotterFactory("SVT Pulse Fit").create("Pulse Shape");
         plotter5.setTitle("Pulse shape");

-        //plotterFrame.addPlotter(plotter5);

         plotter5.style().dataStyle().errorBarStyle().setVisible(false);
         plotter5.style().statisticsBoxStyle().setVisible(false);
         plotter5.style().setParameter("hist2DStyle", "colorMap");

@@ -95,7 +91,6 @@

         plotter5.style().zAxisStyle().setParameter("scale", "log");
         plotter5.style().zAxisStyle().setVisible(false);
         plotter5.createRegions(4, 5);

-//        plotter5.createRegion();

 
         for (int module = 0; module < 2; module++) {
             for (int layer = 0; layer < 10; layer++) {

@@ -114,11 +109,6 @@

 
             }
         }

-//        shape = aida.histogram2D("Shape", 200, -1, 3, 200, -0.5, 2);
-//        plotter5.region(0).plot(shape);
-
-        //plotterFrame.pack();
-        //plotterFrame.setVisible(true);

     }
 
     public SVTPulseFitPlots() {

@@ -132,7 +122,6 @@

         this.fittedTrackerHitCollectionName = fittedTrackerHitCollectionName;
     }

-    @Override

     public void process(EventHeader event) {
         ++eventCount;
         List<HPSFittedRawTrackerHit> fittedrawHits = event.get(HPSFittedRawTrackerHit.class, fittedTrackerHitCollectionName);

@@ -163,7 +152,6 @@

         }
     }

-    @Override

     public void endOfData() {
         if (outputPlots != null) {
             try {

@@ -172,10 +160,8 @@

                 Logger.getLogger(TrackingReconstructionPlots.class.getName()).log(Level.SEVERE, null, ex);
             }
         }

-        //plotterFrame.dispose();

-    @Override

     public void reset() {
         for (int module = 0; module < 2; module++) {
             for (int layer = 0; layer < 10; layer++) {

import org.lcsim.detector.identifier.IIdentifier; import org.lcsim.detector.identifier.IIdentifierHelper; import org.lcsim.detector.tracker.silicon.SiSensor; import org.lcsim.event.EventHeader; import org.lcsim.event.RawTrackerHit; import org.lcsim.geometry.Detector;

Commit in `hps-java/src/main/java/org/lcsim/hps/monitoring/svt` on MAIN
`TrackTimePlots.java`	+1	-1	1.4 -> 1.5
`SVTHitRecoCorrelations.java`	+10	-8	1.9 -> 1.10
`SVTHitReconstructionPlots.java`	+8	-2	1.20 -> 1.21
`TrackingReconstructionPlots.java`	+1	-1	1.18 -> 1.19
`SVTPulseFitPlots.java`	+7	-21	1.6 -> 1.7
`SensorOccupancyPlotsDriver.java`	+1	-2	1.6 -> 1.7
`SVTHitPulsePlots.java`	+7	-2	1.17 -> 1.18
`SVTMonitoringPlots.java`	+5	-3	1.7 -> 1.8
	+40	-40