1 removed + 24 modified, total 25 files
java/trunk/analysis/src/main/java/org/hps/analysis/ecal
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSMCParticlePlotsDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSMCParticlePlotsDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -14,7 +14,6 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.base.ParticleTypeClassifier;
-import org.hps.util.AIDAFrame;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
@@ -27,7 +26,7 @@
public class HPSMCParticlePlotsDriver extends Driver {
AIDA aida = AIDA.defaultInstance();
- private AIDAFrame pFrame;
+ //private AIDAFrame pFrame;
IAnalysisFactory af = aida.analysisFactory();
public boolean _hideFrame = false;
// MCParticle plots.
@@ -160,8 +159,8 @@
eventEPlot.annotation().addItem("xAxisLabel", "E [GeV]");
- pFrame = new AIDAFrame();
- pFrame.setTitle("Truth MC Particle Plots");
+ //pFrame = new AIDAFrame();
+ //pFrame.setTitle("Truth MC Particle Plots");
IPlotter pPlotter = af.createPlotterFactory().create();
pPlotter.setTitle("Truth MC Types");
pPlotter.createRegions(2,2);
@@ -199,10 +198,10 @@
}
- pFrame.addPlotter(pPlotter2);
- pFrame.addPlotter(pPlotter);
- pFrame.pack();
- pFrame.setVisible(!_hideFrame);
+ //pFrame.addPlotter(pPlotter2);
+ //pFrame.addPlotter(pPlotter);
+ //pFrame.pack();
+ //pFrame.setVisible(!_hideFrame);
@@ -369,7 +368,7 @@
public void endOfData() {
- if(this._hideFrame) pFrame.dispose();
+ //if(this._hideFrame) pFrame.dispose();
}
}
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal/EcalWindowPlots.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal/EcalWindowPlots.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -12,7 +12,6 @@
import javax.swing.JLabel;
import org.hps.conditions.deprecated.EcalConditions;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -23,7 +22,7 @@
private String inputCollection = "EcalReadoutHits";
private IPlotter plotter;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida;
private Detector detector;
private IHistogram1D windowPlot;
@@ -82,17 +81,17 @@
}
private void setupPlots() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
aida = AIDA.defaultInstance();
aida.tree().cd("/");
plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL Window Plots");
- plotterFrame = new AIDAFrame();
- plotterFrame.addPlotter(plotter);
- plotterFrame.setVisible(true);
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.addPlotter(plotter);
+ //plotterFrame.setVisible(true);
IPlotterStyle pstyle = plotter.style();
pstyle.dataStyle().errorBarStyle().setVisible(false);
windowPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Window Mode Data", window, -0.5, window - 0.5);
@@ -102,28 +101,28 @@
crateCombo.addActionListener(this);
crateLabel = new JLabel("crate");
crateLabel.setLabelFor(crateCombo);
- plotterFrame.getControlsPanel().add(crateLabel);
- plotterFrame.getControlsPanel().add(crateCombo);
+ //plotterFrame.getControlsPanel().add(crateLabel);
+ //plotterFrame.getControlsPanel().add(crateCombo);
slotCombo = new JComboBox(slotList);
slotCombo.addActionListener(this);
slotLabel = new JLabel("slot");
slotLabel.setLabelFor(slotCombo);
- plotterFrame.getControlsPanel().add(slotLabel);
- plotterFrame.getControlsPanel().add(slotCombo);
+ //plotterFrame.getControlsPanel().add(slotLabel);
+ //plotterFrame.getControlsPanel().add(slotCombo);
channelCombo = new JComboBox(channelList);
channelCombo.addActionListener(this);
channelLabel = new JLabel("channel");
channelLabel.setLabelFor(channelCombo);
- plotterFrame.getControlsPanel().add(channelLabel);
- plotterFrame.getControlsPanel().add(channelCombo);
- plotterFrame.pack();
+ //plotterFrame.getControlsPanel().add(channelLabel);
+ //plotterFrame.getControlsPanel().add(channelCombo);
+ //plotterFrame.pack();
}
@Override
public void endOfData() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
}
@Override
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal/EcalWindowPlotsXY.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/ecal/EcalWindowPlotsXY.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -11,7 +11,6 @@
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -25,7 +24,7 @@
private String subdetectorName;
private String inputCollection;
private IPlotter plotter;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida;
private Detector detector;
private IDDecoder dec;
@@ -90,17 +89,17 @@
}
private void setupPlots() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
aida = AIDA.defaultInstance();
aida.tree().cd("/");
plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL Window Plots");
- plotterFrame = new AIDAFrame();
- plotterFrame.addPlotter(plotter);
- plotterFrame.setVisible(true);
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.addPlotter(plotter);
+ //plotterFrame.setVisible(true);
IPlotterStyle pstyle = plotter.style();
pstyle.dataStyle().errorBarStyle().setVisible(false);
windowPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Window Mode Data", window, -0.5, window - 0.5);
@@ -110,21 +109,21 @@
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- plotterFrame.getControlsPanel().add(xLabel);
- plotterFrame.getControlsPanel().add(xCombo);
+ //plotterFrame.getControlsPanel().add(xLabel);
+ //plotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(yCombo);
- plotterFrame.getControlsPanel().add(yLabel);
- plotterFrame.getControlsPanel().add(yCombo);
- plotterFrame.pack();
+ //plotterFrame.getControlsPanel().add(yLabel);
+ //plotterFrame.getControlsPanel().add(yCombo);
+ //plotterFrame.pack();
}
public void endOfData() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
}
public void process(EventHeader event) {
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -12,7 +12,6 @@
import javax.swing.JLabel;
import org.hps.conditions.deprecated.EcalConditions;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -23,7 +22,7 @@
private String inputCollection = "EcalReadoutHits";
private IPlotter plotter;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida;
private Detector detector;
private IHistogram1D windowPlot;
@@ -82,17 +81,17 @@
}
private void setupPlots() {
- if (plotterFrame != null) {
- plotterFrame.dispose(); //this clears the plotterFrame
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose(); //this clears the plotterFrame
+ //}
aida = AIDA.defaultInstance();
aida.tree().cd("/");
plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL Window Plots");
- plotterFrame = new AIDAFrame();
- plotterFrame.addPlotter(plotter);
- plotterFrame.setVisible(true);
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.addPlotter(plotter);
+ //plotterFrame.setVisible(true);
IPlotterStyle pstyle = plotter.style();
pstyle.dataStyle().errorBarStyle().setVisible(false);
windowPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Window Mode Data", window, -0.5, window - 0.5);
@@ -102,28 +101,28 @@
crateCombo.addActionListener(this);
crateLabel = new JLabel("crate");
crateLabel.setLabelFor(crateCombo);
- plotterFrame.getControlsPanel().add(crateLabel);
- plotterFrame.getControlsPanel().add(crateCombo);
+ //plotterFrame.getControlsPanel().add(crateLabel);
+ //plotterFrame.getControlsPanel().add(crateCombo);
slotCombo = new JComboBox(slotList);
slotCombo.addActionListener(this);
slotLabel = new JLabel("slot");
slotLabel.setLabelFor(slotCombo);
- plotterFrame.getControlsPanel().add(slotLabel);
- plotterFrame.getControlsPanel().add(slotCombo);
+ //plotterFrame.getControlsPanel().add(slotLabel);
+ //plotterFrame.getControlsPanel().add(slotCombo);
channelCombo = new JComboBox(channelList);
channelCombo.addActionListener(this);
channelLabel = new JLabel("channel");
channelLabel.setLabelFor(channelCombo);
- plotterFrame.getControlsPanel().add(channelLabel);
- plotterFrame.getControlsPanel().add(channelCombo);
- plotterFrame.pack();
+ //plotterFrame.getControlsPanel().add(channelLabel);
+ //plotterFrame.getControlsPanel().add(channelCombo);
+ //plotterFrame.pack();
}
@Override
public void endOfData() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
}
@Override
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -11,7 +11,6 @@
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -25,7 +24,7 @@
private String subdetectorName= "Ecal";
private String inputCollection;
private IPlotter plotter;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida;
private Detector detector;
private IDDecoder dec;
@@ -91,17 +90,17 @@
private void setupPlots() {
System.out.println("ECAL WINDOW PLOTS START");
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
aida = AIDA.defaultInstance();
aida.tree().cd("/");
plotter = aida.analysisFactory().createPlotterFactory().create("HPS ECAL Window Plots");
- plotterFrame = new AIDAFrame();
- plotterFrame.addPlotter(plotter);
- plotterFrame.setVisible(true);
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.addPlotter(plotter);
+ //plotterFrame.setVisible(true);
IPlotterStyle pstyle = plotter.style();
pstyle.dataStyle().errorBarStyle().setVisible(false);
windowPlot = aida.histogram1D(detector.getDetectorName() + " : " + inputCollection + " : Window Mode Data", window, -0.5, window - 0.5);
@@ -111,23 +110,23 @@
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- plotterFrame.getControlsPanel().add(xLabel);
- plotterFrame.getControlsPanel().add(xCombo);
+ //plotterFrame.getControlsPanel().add(xLabel);
+ //plotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(yCombo);
- plotterFrame.getControlsPanel().add(yLabel);
- plotterFrame.getControlsPanel().add(yCombo);
- plotterFrame.pack();
+ //plotterFrame.getControlsPanel().add(yLabel);
+ //plotterFrame.getControlsPanel().add(yCombo);
+ //plotterFrame.pack();
- plotterFrame.show();
+ //plotterFrame.show();
}
public void endOfData() {
- if (plotterFrame != null) {
- plotterFrame.dispose();
- }
+ //if (plotterFrame != null) {
+ // plotterFrame.dispose();
+ //}
}
public void process(EventHeader event) {
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/ElwinsTrackingRecon.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/ElwinsTrackingRecon.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -18,11 +18,10 @@
import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.DumbShaperFit;
-import org.hps.recon.tracking.ShaperFitAlgorithm;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.ShaperFitAlgorithm;
import org.hps.recon.tracking.StraightLineTrack;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -48,11 +47,11 @@
*/
public class ElwinsTrackingRecon extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
- private AIDAFrame topFrame;
- private AIDAFrame bottomFrame;
- private AIDAFrame chargeFrame;
- private AIDAFrame twotrackFrame;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame topFrame;
+ //private AIDAFrame bottomFrame;
+ //private AIDAFrame chargeFrame;
+ //private AIDAFrame twotrackFrame;
private AIDA aida = AIDA.defaultInstance();
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
@@ -122,11 +121,11 @@
protected void detectorChanged(Detector detector) {
this.detector = detector;
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Tracking Plots");
- twotrackFrame = new AIDAFrame();
- twotrackFrame.setTitle("Two Track Plots");
+ //twotrackFrame = new AIDAFrame();
+ //twotrackFrame.setTitle("Two Track Plots");
sensors = detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
@@ -137,7 +136,7 @@
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(2, 2);
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
trkPx = aida.histogram1D("Track X Momentum", 25, -0.25, 0.25);
IHistogram1D trkPy = aida.histogram1D("Track Y Momentum", 25, -0.1, 0.1);
@@ -152,7 +151,7 @@
plotter2 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter2.setTitle("Track extrapolation");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
IPlotterStyle style2 = plotter2.style();
style2.dataStyle().fillStyle().setColor("yellow");
style2.dataStyle().errorBarStyle().setVisible(false);
@@ -177,7 +176,7 @@
twotrkextra = fac.createPlotterFactory().create("Two Trk Extrapolation");
twotrkextra.setTitle("Stuff");
- plotterFrame.addPlotter(twotrkextra);
+ //plotterFrame.addPlotter(twotrkextra);
IPlotterStyle styletwo = twotrkextra.style();
styletwo.dataStyle().fillStyle().setColor("blue");
styletwo.dataStyle().errorBarStyle().setVisible(false);
@@ -199,7 +198,7 @@
plotter222 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter222.setTitle("Other");
- plotterFrame.addPlotter(plotter222);
+ //plotterFrame.addPlotter(plotter222);
IPlotterStyle style222 = plotter222.style();
style222.dataStyle().fillStyle().setColor("yellow");
style222.dataStyle().errorBarStyle().setVisible(false);
@@ -220,8 +219,8 @@
plotter222.region(5).plot(ampcl2);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
twotrkextra2 = fac.createPlotterFactory().create("Two Trk Uncertainties");
@@ -377,26 +376,26 @@
plotter9017.createRegions(2, 2);
threetrack.createRegion();
- twotrackFrame.addPlotter(plotter9000);
- twotrackFrame.addPlotter(plotter9001);
- twotrackFrame.addPlotter(plotter9002);
- twotrackFrame.addPlotter(plotter9003);
- twotrackFrame.addPlotter(plotter9004);
- twotrackFrame.addPlotter(plotter9005);
- twotrackFrame.addPlotter(plotter9006);
- twotrackFrame.addPlotter(plotter9007);
- twotrackFrame.addPlotter(plotter9008);
- twotrackFrame.addPlotter(plotter9009);
- twotrackFrame.addPlotter(plotter9010);
- twotrackFrame.addPlotter(plotter9011);
- twotrackFrame.addPlotter(plotter9012);
+// twotrackFrame.addPlotter(plotter9000);
+// twotrackFrame.addPlotter(plotter9001);
+// twotrackFrame.addPlotter(plotter9002);
+// twotrackFrame.addPlotter(plotter9003);
+// twotrackFrame.addPlotter(plotter9004);
+// twotrackFrame.addPlotter(plotter9005);
+// twotrackFrame.addPlotter(plotter9006);
+// twotrackFrame.addPlotter(plotter9007);
+// twotrackFrame.addPlotter(plotter9008);
+// twotrackFrame.addPlotter(plotter9009);
+// twotrackFrame.addPlotter(plotter9010);
+// twotrackFrame.addPlotter(plotter9011);
+// twotrackFrame.addPlotter(plotter9012);
// twotrackFrame.addPlotter(plotter9013);
// twotrackFrame.addPlotter(plotter9014);
- twotrackFrame.addPlotter(plotter9015);
- twotrackFrame.addPlotter(plotter9016);
- twotrackFrame.addPlotter(plotter9017);
- twotrackFrame.addPlotter(twotrkextra2);
- twotrackFrame.addPlotter(threetrack);
+// twotrackFrame.addPlotter(plotter9015);
+// twotrackFrame.addPlotter(plotter9016);
+// twotrackFrame.addPlotter(plotter9017);
+// twotrackFrame.addPlotter(twotrkextra2);
+// twotrackFrame.addPlotter(threetrack);
IHistogram1D trkbins = aida.histogram1D("Track Distributions", 5, -2, 3);
IHistogram2D twtrkptot = aida.histogram2D("Total P+ vs. P-", 60, 0, 4, 60, 0, 4);
@@ -457,8 +456,8 @@
IHistogram2D yzept = aida.histogram2D("Y v Z - e+ Top", 50, -35, 30, 50, -800, -450);
IHistogram1D three = aida.histogram1D("Three Track Invariant Mass", 50, 0, .4);
- twotrackFrame.pack();
- twotrackFrame.setVisible(true);
+ //twotrackFrame.pack();
+ //twotrackFrame.setVisible(true);
plotter9000.region(0).plot(trkbins);
plotter9001.region(0).plot(twtrkptot);
@@ -1489,9 +1488,9 @@
Logger.getLogger(ElwinsTrackingRecon.class.getName()).log(Level.SEVERE, null, ex);
}
}
- plotterFrame.dispose();
- topFrame.dispose();
- bottomFrame.dispose();
+ //plotterFrame.dispose();
+ //topFrame.dispose();
+ //bottomFrame.dispose();
}
private HPSEcalCluster findClosestCluster(Hep3Vector posonhelix, List<HPSEcalCluster> clusters) {
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -15,7 +15,6 @@
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
@@ -32,7 +31,7 @@
*/
public class ExamplePlotter extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
IPlotter plotter;
IAnalysisFactory fac = aida.analysisFactory();
@@ -41,8 +40,8 @@
protected void detectorChanged(Detector detector) {
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Tracking Plots");
plotter = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter.setTitle("Momentum");
@@ -50,7 +49,7 @@
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(2, 3);
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
IHistogram1D trkPx = aida.histogram1D("Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D trkPy = aida.histogram1D("Track Momentum (Py)", 25, -0.1, 0.1);
@@ -65,8 +64,8 @@
plotter.region(4).plot(xAtConvert);
plotter.region(5).plot(yAtConvert);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public void process(EventHeader event) {
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -19,7 +19,6 @@
import org.hps.recon.tracking.EventQuality;
import org.hps.recon.tracking.TrackUtils;
import org.hps.users.phansson.TrigRateDriver;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -48,7 +47,7 @@
private boolean _debug = false;
private boolean _includeMS = true;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
// ICloud1D[] _h_resz_track_top = new ICloud1D[5];
// ICloud1D[] _h_resz_track_bottom = new ICloud1D[5];
// ICloud1D[] _h_resy_track_top = new ICloud1D[5];
@@ -257,6 +256,7 @@
((PlotterRegion) _plotter_mean_res.region(1)).getPlot().setAllowPopupMenus(true);
+ /*
plotterFrame = new AIDAFrame();
plotterFrame.setTitle("HTH Residuals");
plotterFrame.addPlotter(_plotter_resz_top);
@@ -266,6 +266,7 @@
plotterFrame.addPlotter(_plotter_mean_res);
plotterFrame.pack();
plotterFrame.setVisible(!hideFrame);
+ */
}
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -16,7 +16,6 @@
import java.util.logging.Logger;
import org.hps.readout.ecal.ReadoutTimestamp;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
@@ -37,7 +36,7 @@
*/
public class HitTimePlotter extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
IPlotter plotter;
IPlotter plotter2;
@@ -55,8 +54,8 @@
protected void detectorChanged(Detector detector) {
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Tracking Plots");
sensors = detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
sensorRegionMap = new HashMap<String, Integer>();
for (SiSensor sensor : sensors) {
@@ -70,7 +69,7 @@
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(3, 2);
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
IHistogram1D ecalHT = aida.histogram1D("ECAL Hit Time", 100, 0, 400);
IHistogram1D svtHT = aida.histogram1D("SVT Hit Time", 125, -50, 75);
@@ -109,13 +108,13 @@
style2.dataStyle().fillStyle().setColor("yellow");
style2.dataStyle().errorBarStyle().setVisible(false);
plotter2.createRegions(6, 2);
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter3 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter3.setTitle("Outer Tracker");
plotter3.setStyle(style2);
plotter3.createRegions(6, 4);
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter4 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter4.setTitle("Corrected Times: Inner Tracker");
@@ -123,13 +122,13 @@
style4.dataStyle().fillStyle().setColor("yellow");
style4.dataStyle().errorBarStyle().setVisible(false);
plotter4.createRegions(6, 2);
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter5 = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter5.setTitle("Outer Tracker");
plotter5.setStyle(style2);
plotter5.createRegions(6, 4);
- plotterFrame.addPlotter(plotter5);
+ //plotterFrame.addPlotter(plotter5);
int region = 0;
@@ -160,7 +159,7 @@
plotter6.setTitle("Tracks");
plotter6.setStyle(style2);
plotter6.createRegions(2, 2);
- plotterFrame.addPlotter(plotter6);
+ //plotterFrame.addPlotter(plotter6);
IHistogram1D px = aida.histogram1D("Track Momentum(Px)", 50, -0.2, 0.2);
IHistogram1D py = aida.histogram1D("Track Momentum(Py)", 50, -0.2, 0.2);
IHistogram1D pz = aida.histogram1D("Track Momentum(Pz)", 50, 0, 2.2);
@@ -175,7 +174,7 @@
plotter7.setTitle("Per Event");
plotter7.setStyle(style2);
plotter7.createRegions(2, 2);
- plotterFrame.addPlotter(plotter7);
+ //plotterFrame.addPlotter(plotter7);
IHistogram1D nclus = aida.histogram1D("Strip Clusters per Event", 100, 0, 99);
IHistogram1D nhth = aida.histogram1D("Stereo Hits per Event", 100, 0, 99);
@@ -187,8 +186,8 @@
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public void process(EventHeader event) {
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -16,7 +16,6 @@
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
@@ -32,7 +31,7 @@
*/
public class TrackExtrapolationAnalysis extends Driver {
- private AIDAFrame extrapFrame;
+ //private AIDAFrame extrapFrame;
private AIDA aida = AIDA.defaultInstance();
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
@@ -63,12 +62,12 @@
protected void detectorChanged(Detector detector) {
this.detector = detector;
aida.tree().cd("/");
- extrapFrame = new AIDAFrame();
- extrapFrame.setTitle("Extrapolation Debugging Plots");
+ //extrapFrame = new AIDAFrame();
+ //extrapFrame.setTitle("Extrapolation Debugging Plots");
makeExtrapolationPlots();
- extrapFrame.pack();
- extrapFrame.setVisible(true);
+ //extrapFrame.pack();
+ //extrapFrame.setVisible(true);
}
@@ -227,7 +226,7 @@
extrap0 = fac.createPlotterFactory().create("HPS Tracking Plots");
extrap0.setTitle("New Track extrapolation");
- extrapFrame.addPlotter(extrap0);
+ //extrapFrame.addPlotter(extrap0);
IPlotterStyle style0 = extrap0.style();
style0.dataStyle().fillStyle().setColor("yellow");
style0.dataStyle().errorBarStyle().setVisible(false);
@@ -252,7 +251,7 @@
extrap1 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap1.setTitle("HPSTrack Plots");
- extrapFrame.addPlotter(extrap1);
+ //extrapFrame.addPlotter(extrap1);
set2DStyle(extrap1.style());
extrap1.createRegions(1, 2);
@@ -265,7 +264,7 @@
extrap2 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap2.setTitle("HPSTrack vs SLT Plots");
- extrapFrame.addPlotter(extrap2);
+ //extrapFrame.addPlotter(extrap2);
set2DStyle(extrap2.style());
extrap2.createRegions(1, 2);
@@ -278,7 +277,7 @@
extrap3 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap3.setTitle("Extend vs SLT Plots");
- extrapFrame.addPlotter(extrap3);
+ //extrapFrame.addPlotter(extrap3);
set2DStyle(extrap3.style());
extrap3.createRegions(1, 2);
@@ -290,7 +289,7 @@
extrap4 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap4.setTitle("Nominal Track Trajectory");
- extrapFrame.addPlotter(extrap4);
+ //extrapFrame.addPlotter(extrap4);
set2DStyle(extrap4.style());
extrap4.createRegions(1, 2);
@@ -301,7 +300,7 @@
extrap5 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap5.setTitle("Nominal Direction");
- extrapFrame.addPlotter(extrap5);
+ //extrapFrame.addPlotter(extrap5);
set2DStyle(extrap5.style());
extrap5.createRegions(1, 2);
@@ -314,7 +313,7 @@
extrap7 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap7.setTitle("Track @ 0");
- extrapFrame.addPlotter(extrap7);
+ //extrapFrame.addPlotter(extrap7);
set2DStyle(extrap7.style());
extrap7.createRegions(1, 2);
@@ -327,7 +326,7 @@
extrap8 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap8.setTitle("Track X vs dX");
- extrapFrame.addPlotter(extrap8);
+ //extrapFrame.addPlotter(extrap8);
set2DStyle(extrap8.style());
extrap8.createRegions(2, 2);
@@ -343,7 +342,7 @@
extrap9 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap9.setTitle("Track X vs P");
- extrapFrame.addPlotter(extrap9);
+ //extrapFrame.addPlotter(extrap9);
set2DStyle(extrap9.style());
extrap9.createRegions(2, 2);
@@ -359,7 +358,7 @@
extrap10 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap10.setTitle("Track dX vs P");
- extrapFrame.addPlotter(extrap10);
+ //extrapFrame.addPlotter(extrap10);
set2DStyle(extrap10.style());
extrap10.createRegions(2, 2);
@@ -377,7 +376,7 @@
extrap6 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap6.setTitle("@ ECal HPS vs Extend");
- extrapFrame.addPlotter(extrap6);
+ //extrapFrame.addPlotter(extrap6);
set2DStyle(extrap6.style());
extrap6.createRegions(1, 2);
@@ -389,7 +388,7 @@
extrap11 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap11.setTitle("@ ECal HPS vs Cluster");
- extrapFrame.addPlotter(extrap11);
+ //extrapFrame.addPlotter(extrap11);
set2DStyle(extrap11.style());
extrap11.createRegions(1, 2);
@@ -403,7 +402,7 @@
extrap12 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap12.setTitle("Cluster Resid X");
- extrapFrame.addPlotter(extrap12);
+ //extrapFrame.addPlotter(extrap12);
set1DStyle(extrap10.style());
extrap12.createRegions(2, 2);
@@ -420,7 +419,7 @@
extrap13 = fac.createPlotterFactory().create("Extrapolation Debug Plots");
extrap13.setTitle("Cluster Resid Y");
- extrapFrame.addPlotter(extrap13);
+ //extrapFrame.addPlotter(extrap13);
set1DStyle(extrap10.style());
extrap13.createRegions(2, 2);
java/trunk/users/src/main/java/org/hps/users/mgraham
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -21,7 +21,6 @@
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
@@ -46,7 +45,7 @@
public String outputTextName = "myevents.txt";
FileWriter fw;
PrintWriter pw;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
IPlotter plotter;
IPlotter plotter2;
@@ -65,19 +64,19 @@
protected void detectorChanged(Detector detector) {
aida.tree().cd("/");
- if (showPlots) {
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
- }
+ //if (showPlots) {
+ // plotterFrame = new AIDAFrame();
+ // plotterFrame.setTitle("HPS Tracking Plots");
+ //}
plotter = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter.setTitle("Momentum");
IPlotterStyle style = plotter.style();
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(2, 2);
- if (showPlots) {
- plotterFrame.addPlotter(plotter);
- }
+ //if (showPlots) {
+ // plotterFrame.addPlotter(plotter);
+ //}
IHistogram1D trkPx = aida.histogram1D("Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D trkPy = aida.histogram1D("Track Momentum (Py)", 25, -0.1, 0.1);
@@ -97,9 +96,9 @@
plotter2.style().dataStyle().fillStyle().setColor("yellow");
plotter2.style().dataStyle().errorBarStyle().setVisible(false);
plotter2.createRegions(2, 2);
- if (showPlots) {
- plotterFrame.addPlotter(plotter2);
- }
+ //if (showPlots) {
+ // plotterFrame.addPlotter(plotter2);
+ //}
IHistogram1D xvert = aida.histogram1D("XVertex", 40, -30, 50);
IHistogram1D yvert = aida.histogram1D("YVertex", 40, -35, 30);
@@ -116,9 +115,9 @@
plotter4.style().dataStyle().fillStyle().setColor("yellow");
plotter4.style().dataStyle().errorBarStyle().setVisible(false);
plotter4.createRegions(2, 2);
- if (showPlots) {
- plotterFrame.addPlotter(plotter4);
- }
+ //if (showPlots) {
+ // plotterFrame.addPlotter(plotter4);
+ //}
IHistogram1D xvertns = aida.histogram1D("XVertex with y cut", 40, -30, 50);
IHistogram1D yvertns = aida.histogram1D("YVertex with y cut", 40, -35, 30);
@@ -136,9 +135,9 @@
plotter3.style().dataStyle().fillStyle().setColor("yellow");
plotter3.style().dataStyle().errorBarStyle().setVisible(false);
plotter3.createRegions(2, 2);
- if (showPlots) {
- plotterFrame.addPlotter(plotter3);
- }
+ //if (showPlots) {
+ // plotterFrame.addPlotter(plotter3);
+ //}
IHistogram1D xAtConvert = aida.histogram1D("X (mm) @ Converter using Map", 50, -50, 50);
IHistogram1D yAtConvert = aida.histogram1D("Y (mm) @ Converter using Map", 50, -20, 20);
IHistogram1D xAtConvertSLT = aida.histogram1D("X (mm) @ Converter using SLT", 50, -50, 50);
@@ -153,9 +152,9 @@
plotter5.style().dataStyle().fillStyle().setColor("yellow");
plotter5.style().dataStyle().errorBarStyle().setVisible(false);
//plotter5.createRegions(2, 2);
- if (showPlots) {
- plotterFrame.addPlotter(plotter5);
- }
+ //if (showPlots) {
+ // plotterFrame.addPlotter(plotter5);
+ //}
IHistogram1D invMass = aida.histogram1D("Invariant Mass", 50, 0, .4);
plotter5.region(0).plot(invMass);
@@ -239,10 +238,10 @@
plotter8.region(1).plot(xzemt);
plotter8.region(2).plot(yzemt);
- if (showPlots) {
- plotterFrame.pack();
- plotterFrame.setVisible(true);
- }
+ //if (showPlots) {
+ // plotterFrame.pack();
+ // plotterFrame.setVisible(true);
+ //}
}
public void setIsMC(boolean setit) {
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitCorrelations.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitCorrelations.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -8,7 +8,6 @@
import java.util.List;
import org.hps.conditions.deprecated.SvtUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitEfficiency.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtHitEfficiency.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -21,7 +21,6 @@
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
import org.hps.recon.tracking.TrackerHitUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.solids.Box;
import org.lcsim.detector.solids.Point3D;
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -26,7 +26,6 @@
import org.hps.recon.tracking.ShaperAnalyticFitAlgorithm;
import org.hps.recon.tracking.TrackUtils;
import org.hps.recon.tracking.apv25.SvtReadout;
-import org.hps.util.AIDAFrame;
//--- lcsim ---//
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
java/trunk/users/src/main/java/org/hps/users/omoreno
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -12,7 +12,6 @@
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
//--- org.lcsim ---//
import org.lcsim.event.EventHeader;
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -12,7 +12,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
@@ -36,7 +35,7 @@
private boolean hideFrame = false;
private boolean _debug = false;
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
ICloud1D _h_chi2;
ICloud1D _h_ntracksdiff;
ICloud1D _h_d0_diff;
@@ -180,12 +179,12 @@
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("Compare Generated and Fitted Tracks");
- plotterFrame.addPlotter(_plotter_trackparamdiff);
- plotterFrame.addPlotter(_plotter_others);
- plotterFrame.pack();
- plotterFrame.setVisible(!hideFrame);
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("Compare Generated and Fitted Tracks");
+ //plotterFrame.addPlotter(_plotter_trackparamdiff);
+ //plotterFrame.addPlotter(_plotter_others);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(!hideFrame);
}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -23,7 +23,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.hps.util.Redrawable;
import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
@@ -55,7 +54,7 @@
private int refreshRate = 100;
private AIDA aida = AIDA.defaultInstance();
private IAnalysisFactory af = aida.analysisFactory();
- private AIDAFrame pePlotterFrame;
+ //private AIDAFrame pePlotterFrame;
private IPlotter plotter;
private JComboBox xCombo;
private JLabel xLabel;
@@ -89,8 +88,8 @@
Logger.getLogger(ECalGainDriver.class.getName()).log(Level.SEVERE, null, ex);
}
- pePlotterFrame = new AIDAFrame();
- pePlotterFrame.setTitle("Gain Frame");
+ //pePlotterFrame = new AIDAFrame();
+ //pePlotterFrame.setTitle("Gain Frame");
IPlotterStyle style;
@@ -98,7 +97,7 @@
plotter_hitmap_gr.createRegions(1, 3, 0);
plotter_hitmap_gr.setTitle("Cluster hit map");
plotter_hitmap_gr.style().statisticsBoxStyle().setVisible(false);
- pePlotterFrame.addPlotter(plotter_hitmap_gr);
+ //pePlotterFrame.addPlotter(plotter_hitmap_gr);
hitmap = aida.histogram2D("Cluster hit map", 46, -23, 23, 11, -5.5, 5.5);
plotter_hitmap_gr.region(0).plot(hitmap);
@@ -123,7 +122,7 @@
plotter_PoverE[iE].createRegions(1, 2, 0);
plotter_PoverE[iE].setTitle("E over P" + str);
plotter_PoverE[iE].style().statisticsBoxStyle().setVisible(true);
- pePlotterFrame.addPlotter(plotter_PoverE[iE]);
+ //pePlotterFrame.addPlotter(plotter_PoverE[iE]);
plotter_PoverE[iE].region(0).plot(h_PE_t[iE]);
plotter_PoverE[iE].region(1).plot(h_PE_b[iE]);
@@ -133,7 +132,7 @@
plotter.createRegions(1, 3, 0);
plotter.setTitle("Gain Plots");
- pePlotterFrame.addPlotter(plotter);
+ //pePlotterFrame.addPlotter(plotter);
mpePlot = aida.histogram2D("<E over p>", 46, -23, 23, 11, -5.5, 5.5);
plotter.region(0).plot(mpePlot);
@@ -182,27 +181,27 @@
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- pePlotterFrame.getControlsPanel().add(xLabel);
- pePlotterFrame.getControlsPanel().add(xCombo);
+ //pePlotterFrame.getControlsPanel().add(xLabel);
+ //pePlotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(xCombo);
- pePlotterFrame.getControlsPanel().add(yLabel);
- pePlotterFrame.getControlsPanel().add(yCombo);
+ //pePlotterFrame.getControlsPanel().add(yLabel);
+ //pePlotterFrame.getControlsPanel().add(yCombo);
plotter.region(2).plot(pePlots[-5 + 23][2 + 5 - 1][0]);
xCombo.setSelectedIndex(-5 + 23);
yCombo.setSelectedIndex(2 + 5 - 1);
blankButton = new JButton("Hide histogram");
- pePlotterFrame.getControlsPanel().add(blankButton);
+ //pePlotterFrame.getControlsPanel().add(blankButton);
blankButton.addActionListener(this);
- if (!hideFrame) {
- pePlotterFrame.pack();
- pePlotterFrame.setVisible(true);
- }
+ //if (!hideFrame) {
+ // pePlotterFrame.pack();
+ // pePlotterFrame.setVisible(true);
+ //}
}
public ECalGainDriver() {
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -20,7 +20,6 @@
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.readout.ecal.TriggerData;
-import org.hps.util.AIDAFrame;
import org.hps.util.Redrawable;
import org.hps.util.Resettable;
import org.lcsim.detector.identifier.ExpandedIdentifier;
@@ -53,9 +52,9 @@
private IPlotter plotterBot3;
private IPlotter plotterBot4;
private AIDA aida = AIDA.defaultInstance();
- private AIDAFrame plotterFrame;
+ /*private AIDAFrame plotterFrame;
private AIDAFrame plotterFrameTop;
- private AIDAFrame plotterFrameBot;
+ private AIDAFrame plotterFrameBot;*/
private IHistogram1D aMeanPlot;
private IHistogram1D aSigmaPlot;
private IHistogram1D tMeanPlot;
@@ -230,29 +229,29 @@
}
}
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS ECal Crystal Filter Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS ECal Crystal Filter Plots");
xCombo = new JComboBox(xList);
xCombo.addActionListener(this);
xLabel = new JLabel("x");
xLabel.setLabelFor(xCombo);
- plotterFrame.getControlsPanel().add(xLabel);
- plotterFrame.getControlsPanel().add(xCombo);
+ //plotterFrame.getControlsPanel().add(xLabel);
+ //plotterFrame.getControlsPanel().add(xCombo);
yCombo = new JComboBox(yList);
yCombo.addActionListener(this);
yLabel = new JLabel("y");
yLabel.setLabelFor(yCombo);
- plotterFrame.getControlsPanel().add(yLabel);
- plotterFrame.getControlsPanel().add(yCombo);
+ //plotterFrame.getControlsPanel().add(yLabel);
+ //plotterFrame.getControlsPanel().add(yCombo);
blankButton = new JButton("Hide histogram");
- plotterFrame.getControlsPanel().add(blankButton);
+ //plotterFrame.getControlsPanel().add(blankButton);
blankButton.addActionListener(this);
// Setup the plotter.
plotter = aida.analysisFactory().createPlotterFactory().create();
plotter.setTitle("HPS ECal Amplitude");
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
plotter.createRegions(1, 3);
plotter.style().statisticsBoxStyle().setVisible(false);
@@ -271,7 +270,7 @@
// Setup the plotter.
plotter2 = aida.analysisFactory().createPlotterFactory().create();
plotter2.setTitle("HPS ECal Hit Time ");
- plotterFrame.addPlotter(plotter2);
+ //plotterFrame.addPlotter(plotter2);
plotter2.createRegions(1, 3);
plotter2.style().statisticsBoxStyle().setVisible(true);
@@ -291,7 +290,7 @@
// Setup the plotter.
plotter3 = aida.analysisFactory().createPlotterFactory().create();
plotter3.setTitle("HPS ECal for Time Outliers ");
- plotterFrame.addPlotter(plotter3);
+ //plotterFrame.addPlotter(plotter3);
plotter3.createRegions(1, 3);
plotter3.style().statisticsBoxStyle().setVisible(false);
@@ -310,7 +309,7 @@
// Setup the plotter.
plotter4 = aida.analysisFactory().createPlotterFactory().create();
plotter4.setTitle("HPS ECal Amplitude for Time Outliers ");
- plotterFrame.addPlotter(plotter4);
+ //plotterFrame.addPlotter(plotter4);
plotter4.createRegions(1, 3);
plotter4.style().statisticsBoxStyle().setVisible(false);
@@ -338,32 +337,32 @@
- plotterFrameTop = new AIDAFrame();
- plotterFrameTop.setTitle("HPS Top Trig ECal Crystal Filter Plots");
+ //plotterFrameTop = new AIDAFrame();
+ //plotterFrameTop.setTitle("HPS Top Trig ECal Crystal Filter Plots");
xComboTop = new JComboBox(xListTop);
xComboTop.addActionListener(this);
xLabelTop = new JLabel("xT");
xLabelTop.setLabelFor(xComboTop);
- plotterFrameTop.getControlsPanel().add(xLabelTop);
- plotterFrameTop.getControlsPanel().add(xComboTop);
+ //plotterFrameTop.getControlsPanel().add(xLabelTop);
+ //plotterFrameTop.getControlsPanel().add(xComboTop);
yComboTop = new JComboBox(yListTop);
yComboTop.addActionListener(this);
yLabelTop = new JLabel("yT");
yLabelTop.setLabelFor(yComboTop);
- plotterFrameTop.getControlsPanel().add(yLabelTop);
- plotterFrameTop.getControlsPanel().add(yComboTop);
+ //plotterFrameTop.getControlsPanel().add(yLabelTop);
+ //plotterFrameTop.getControlsPanel().add(yComboTop);
blankButtonTop = new JButton("Hide histogram (Top)");
- plotterFrameTop.getControlsPanel().add(blankButtonTop);
+ //plotterFrameTop.getControlsPanel().add(blankButtonTop);
blankButtonTop.addActionListener(this);
// Setup the plotterTop.
plotterTop = aida.analysisFactory().createPlotterFactory().create();
plotterTop.setTitle("HPS ECal Amplitude");
- plotterFrameTop.addPlotter(plotterTop);
+ //plotterFrameTop.addPlotter(plotterTop);
plotterTop.createRegions(1, 3);
plotterTop.setStyle(plotter.style());
style = plotterTop.region(0).style();
@@ -379,7 +378,7 @@
// Setup the plotterTop.
plotterTop2 = aida.analysisFactory().createPlotterFactory().create();
plotterTop2.setTitle("HPS ECal Hit Time ");
- plotterFrameTop.addPlotter(plotterTop2);
+ //plotterFrameTop.addPlotter(plotterTop2);
plotterTop2.createRegions(1, 3);
plotterTop2.setStyle(plotter2.style());
@@ -396,7 +395,7 @@
// Setup the plotter.
plotterTop3 = aida.analysisFactory().createPlotterFactory().create();
plotterTop3.setTitle("HPS ECal for Time Outliers ");
- plotterFrameTop.addPlotter(plotterTop3);
+ //plotterFrameTop.addPlotter(plotterTop3);
plotterTop3.createRegions(1, 3);
plotterTop3.setStyle(plotter3.style());
@@ -412,7 +411,7 @@
// Setup the plotter.
plotterTop4 = aida.analysisFactory().createPlotterFactory().create();
plotterTop4.setTitle("HPS ECal Amplitude for Time Outliers ");
- plotterFrameTop.addPlotter(plotterTop4);
+ //plotterFrameTop.addPlotter(plotterTop4);
plotterTop4.createRegions(1, 3);
plotterTop4.setStyle(plotter4.style());
@@ -437,29 +436,29 @@
- plotterFrameBot = new AIDAFrame();
- plotterFrameBot.setTitle("HPS Bottom Trig ECal Crystal Filter Plots");
+ //plotterFrameBot = new AIDAFrame();
+ //plotterFrameBot.setTitle("HPS Bottom Trig ECal Crystal Filter Plots");
xComboBot = new JComboBox(xListBot);
xComboBot.addActionListener(this);
xLabelBot = new JLabel("x");
xLabelBot.setLabelFor(xComboBot);
- plotterFrameBot.getControlsPanel().add(xLabelBot);
- plotterFrameBot.getControlsPanel().add(xComboBot);
+ //plotterFrameBot.getControlsPanel().add(xLabelBot);
+ //plotterFrameBot.getControlsPanel().add(xComboBot);
yComboBot = new JComboBox(yListBot);
yComboBot.addActionListener(this);
yLabelBot = new JLabel("y");
yLabelBot.setLabelFor(yComboBot);
- plotterFrameBot.getControlsPanel().add(yLabelBot);
- plotterFrameBot.getControlsPanel().add(yComboBot);
+ //plotterFrameBot.getControlsPanel().add(yLabelBot);
+ //plotterFrameBot.getControlsPanel().add(yComboBot);
blankButtonBot = new JButton("Hide histogram");
- plotterFrameBot.getControlsPanel().add(blankButtonBot);
+ //plotterFrameBot.getControlsPanel().add(blankButtonBot);
blankButtonBot.addActionListener(this);
// Setup the plotterBot.
plotterBot = aida.analysisFactory().createPlotterFactory().create();
plotterBot.setTitle("HPS ECal Amplitude");
- plotterFrameBot.addPlotter(plotterBot);
+ //plotterFrameBot.addPlotter(plotterBot);
plotterBot.createRegions(1, 3);
plotterBot.setStyle(plotter.style());
style = plotterBot.region(0).style();
@@ -475,7 +474,7 @@
// Setup the plotterBot.
plotterBot2 = aida.analysisFactory().createPlotterFactory().create();
plotterBot2.setTitle("HPS ECal Hit Time ");
- plotterFrameBot.addPlotter(plotterBot2);
+ //plotterFrameBot.addPlotter(plotterBot2);
plotterBot2.createRegions(1, 3);
plotterBot2.setStyle(plotter2.style());
@@ -492,7 +491,7 @@
// Setup the plotter.
plotterBot3 = aida.analysisFactory().createPlotterFactory().create();
plotterBot3.setTitle("HPS ECal for Time Outliers ");
- plotterFrameBot.addPlotter(plotterBot3);
+ //plotterFrameBot.addPlotter(plotterBot3);
plotterBot3.createRegions(1, 3);
plotterBot3.setStyle(plotter3.style());
@@ -508,7 +507,7 @@
// Setup the plotter.
plotterBot4 = aida.analysisFactory().createPlotterFactory().create();
plotterBot4.setTitle("HPS ECal Amplitude for Time Outliers ");
- plotterFrameBot.addPlotter(plotterBot4);
+ //plotterFrameBot.addPlotter(plotterBot4);
plotterBot4.createRegions(1, 3);
plotterBot4.setStyle(plotter4.style());
@@ -532,25 +531,25 @@
- plotterFrame.pack();
- if (!hide) {
- plotterFrame.setVisible(true);
- }
+ //plotterFrame.pack();
+ //if (!hide) {
+ // plotterFrame.setVisible(true);
+ //}
- plotterFrameTop.pack();
- if (!hide) {
- plotterFrameTop.setVisible(true);
- }
+ //plotterFrameTop.pack();
+ //if (!hide) {
+ // plotterFrameTop.setVisible(true);
+ //}
- plotterFrameBot.pack();
- if (!hide) {
- plotterFrameBot.setVisible(true);
- }
+ //plotterFrameBot.pack();
+ //if (!hide) {
+ // plotterFrameBot.setVisible(true);
+ //}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -20,7 +20,6 @@
import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
@@ -58,8 +57,8 @@
private double[] _error = new double[3];
- private AIDAFrame plotterFrame;
- private AIDAFrame plotterFrameSummary;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrameSummary;
private IDataPointSet dps_t;
private IDataPointSet dps_b;
private IDataPointSet dps_pull_t;
@@ -465,17 +464,17 @@
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("Residuals");
- plotterFrameSummary = new AIDAFrame();
- plotterFrameSummary.setTitle("Summary");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("Residuals");
+ //plotterFrameSummary = new AIDAFrame();
+ //plotterFrameSummary.setTitle("Summary");
List<String> sides = new ArrayList<String>(Arrays.asList("top","bottom"));
IPlotter plotter_chi2 = af.createPlotterFactory().create();
plotter_chi2.createRegions(2,2);
plotter_chi2.setTitle("Track Chi2");
- plotterFrame.addPlotter(plotter_chi2);
+ //plotterFrame.addPlotter(plotter_chi2);
ICloud1D hchi2_top = aida.cloud1D("Track Chi2 top");
ICloud1D hchi2_bot = aida.cloud1D("Track Chi2 bottom");
ICloud1D hchi2ndf_top = aida.cloud1D("Track Chi2ndf top");
@@ -587,10 +586,10 @@
}
//plotter_res.show();
- plotterFrame.addPlotter(plotter_res);
- plotterFrame.addPlotter(plotter_reserr);
- plotterFrame.addPlotter(plotter_respull);
- plotterFrame.addPlotter(plotter_respull_slope);
+ //plotterFrame.addPlotter(plotter_res);
+ //plotterFrame.addPlotter(plotter_reserr);
+ //plotterFrame.addPlotter(plotter_respull);
+ //plotterFrame.addPlotter(plotter_respull_slope);
}
@@ -620,7 +619,7 @@
((PlotterRegion) plotter_prf.region(region)).getPlot().setAllowPopupMenus(true);
}
- plotterFrameSummary.addPlotter(plotter_prf);
+ //plotterFrameSummary.addPlotter(plotter_prf);
plotter_resuydiff_t = af.createPlotterFactory().create();
@@ -642,14 +641,14 @@
((PlotterRegion) plotter_resuydiff_b.region(iLayer-1)).getPlot().setAllowPopupMenus(true);
}
- plotterFrameSummary.addPlotter(plotter_resuydiff_t);
- plotterFrameSummary.addPlotter(plotter_resuydiff_b);
+ //plotterFrameSummary.addPlotter(plotter_resuydiff_t);
+ //plotterFrameSummary.addPlotter(plotter_resuydiff_b);
- plotterFrame.pack();
- plotterFrame.setVisible(!hideFrame);
- plotterFrameSummary.pack();
- plotterFrameSummary.setVisible(!hideFrame);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(!hideFrame);
+ //plotterFrameSummary.pack();
+ //plotterFrameSummary.setVisible(!hideFrame);
}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/MultScatAnalysis.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/MultScatAnalysis.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -20,7 +20,6 @@
import org.hps.readout.ecal.TriggerData;
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -72,8 +71,8 @@
private AIDA aida = AIDA.defaultInstance();
private IAnalysisFactory af = aida.analysisFactory();
IHistogramFactory hf = aida.histogramFactory();
- private AIDAFrame plotterFrame;
- private AIDAFrame plotterFrameTrig;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrameTrig;
IPlotter plotter_trig_tag;
IPlotter plotter_cltrkmatchE;
@@ -108,13 +107,13 @@
if(doTriggerPart) {
- plotterFrameTrig = new AIDAFrame();
- plotterFrameTrig.setTitle("Trigger");
+ //plotterFrameTrig = new AIDAFrame();
+ //plotterFrameTrig.setTitle("Trigger");
IPlotter plotter_trig_other = af.createPlotterFactory().create();
plotter_trig_other.createRegions(3,1,0);
plotter_trig_other.setTitle("Other");
- plotterFrameTrig.addPlotter(plotter_trig_other);
+ //plotterFrameTrig.addPlotter(plotter_trig_other);
IHistogram ht1 = aida.histogram1D("trigger_count" , 7, 0, 7);
@@ -137,7 +136,7 @@
plotter_trig_tag = af.createPlotterFactory().create();
plotter_trig_tag.createRegions(3,3,0);
plotter_trig_tag.setTitle("Tag&Probe Top");
- plotterFrameTrig.addPlotter(plotter_trig_tag);
+ //plotterFrameTrig.addPlotter(plotter_trig_tag);
IHistogram htag1 = aida.histogram1D("toptrig_cl_ecal_n_top" , 7, 0, 7);
IHistogram htag2 = aida.histogram1D("toptrig_cl_ecal_e_top" , 100, 0, 1500);
IHistogram htag3 = aida.histogram1D("toptrig_cl_ecal_emax_top" , 100, 0, 1500);
@@ -169,19 +168,19 @@
IPlotter plotter_trig_tag2 = af.createPlotterFactory().create();
plotter_trig_tag2.setTitle("Tag&Probe Top Counts");
- plotterFrameTrig.addPlotter(plotter_trig_tag2);
+ //plotterFrameTrig.addPlotter(plotter_trig_tag2);
IHistogram htag10 = aida.histogram1D("toptrig_cl_ecal_n_bottom" , 7, 0, 7);
plotter_trig_tag2.createRegion().plot(htag10);
- if(!hide) {
- plotterFrameTrig.pack();
- plotterFrameTrig.setVisible(true);
- }
+ //if(!hide) {
+ // plotterFrameTrig.pack();
+ // plotterFrameTrig.setVisible(true);
+ //}
}
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("General");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("General");
@@ -209,12 +208,12 @@
plotter_ecal_cls.createRegions(2,3,0);
plotter_ecal_cls.setTitle("Ecal Cluster size");
- plotterFrame.addPlotter(plotter_ecal_e);
- plotterFrame.addPlotter(plotter_ecal_crhitmap);
- plotterFrame.addPlotter(plotter_ecal_cramp);
- plotterFrame.addPlotter(plotter_ecal_hitmap);
- plotterFrame.addPlotter(plotter_ecal_pos);
- plotterFrame.addPlotter(plotter_ecal_cls);
+ //plotterFrame.addPlotter(plotter_ecal_e);
+ //plotterFrame.addPlotter(plotter_ecal_crhitmap);
+ //plotterFrame.addPlotter(plotter_ecal_cramp);
+ //plotterFrame.addPlotter(plotter_ecal_hitmap);
+ //plotterFrame.addPlotter(plotter_ecal_pos);
+ //plotterFrame.addPlotter(plotter_ecal_cls);
@@ -222,7 +221,7 @@
plotter_track_mom_pos.createRegions(3,3,0);
plotter_track_mom_pos.setTitle("Track Momentum vs Position");
plotter_track_mom_pos.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_track_mom_pos);
+ //plotterFrame.addPlotter(plotter_track_mom_pos);
IHistogram hPzVsX_t = aida.histogram2D("Top track Pz vs X" , 25, -500,500, 50, 0, 3500);
IHistogram hPzVsX_b = aida.histogram2D("Bottom track Pz vs X" , 25, -500,500, 50, 0, 3500);
IHistogram hPzVsX_a = aida.histogram2D("Track Pz vs X" , 25, -500,500, 50, 0, 3500);
@@ -253,7 +252,7 @@
IPlotter plotter_track_mom = af.createPlotterFactory().create();
plotter_track_mom.createRegions(3,3,0);
plotter_track_mom.setTitle("Track Momentum");
- plotterFrame.addPlotter(plotter_track_mom);
+ //plotterFrame.addPlotter(plotter_track_mom);
IHistogram hPz_t = aida.histogram1D("Top track Pz" , 50, 0, 3500);
IHistogram hPz_b = aida.histogram1D("Bottom track Pz" , 50, 0, 3500);
IHistogram hPz_a = aida.histogram1D("Track Pz" , 50, 0, 3500);
@@ -278,7 +277,7 @@
IPlotter plotter_track_mom2 = af.createPlotterFactory().create();
plotter_track_mom2.createRegions(3,3,0);
plotter_track_mom2.setTitle("Track Momentum Target Outliers X");
- plotterFrame.addPlotter(plotter_track_mom2);
+ //plotterFrame.addPlotter(plotter_track_mom2);
IHistogram hPzTX_t = aida.histogram1D("Top track !target in X Pz" , 50, 0, 3500);
IHistogram hPzTX_b = aida.histogram1D("Bottom track !target in X Pz" , 50, 0, 3500);
IHistogram hPzTX_a = aida.histogram1D("Track !target in X Pz" , 50, 0, 3500);
@@ -304,7 +303,7 @@
IPlotter plotter_track_ext = af.createPlotterFactory().create();
plotter_track_ext.createRegions(2,3,0);
plotter_track_ext.setTitle("Track @ Target");
- plotterFrame.addPlotter(plotter_track_ext);
+ //plotterFrame.addPlotter(plotter_track_ext);
IHistogram hTrkXAtConv_t = aida.histogram1D("Top track X @ -67cm" , 50, -100, 100);
IHistogram hTrkYAtConv_t = aida.histogram1D("Top track Y @ -67cm" , 50, -20, 20);
IHistogram hTrkXAtConv_b = aida.histogram1D("Bottom track X @ -67cm" , 50, -100, 100);
@@ -334,7 +333,7 @@
IPlotter plotter_track_ext_entr = af.createPlotterFactory().create();
plotter_track_ext_entr.createRegions(2,3,0);
plotter_track_ext_entr.setTitle("Track @ 0cm");
- plotterFrame.addPlotter(plotter_track_ext_entr);
+ //plotterFrame.addPlotter(plotter_track_ext_entr);
IHistogram hTrkXAtEntr_t = aida.histogram1D("Top track X @ 0cm" , 50, -100, 100);
IHistogram hTrkYAtEntr_t = aida.histogram1D("Top track Y @ 0cm" , 50, -40, 40);
IHistogram hTrkXAtEntr_b = aida.histogram1D("Bottom track X @ 0cm" , 50, -100, 100);
@@ -366,7 +365,7 @@
IPlotter plotter_track_ext_coll = af.createPlotterFactory().create();
plotter_track_ext_coll.createRegions(2,3,0);
plotter_track_ext_coll.setTitle("Track @ -150cm");
- plotterFrame.addPlotter(plotter_track_ext_coll);
+ //plotterFrame.addPlotter(plotter_track_ext_coll);
IHistogram hTrkXAtColl_t = aida.histogram1D("Top track X @ -150cm" , 50, -100, 100);
IHistogram hTrkYAtColl_t = aida.histogram1D("Top track Y @ -150cm" , 50, -40, 40);
IHistogram hTrkXAtColl_b = aida.histogram1D("Bottom track X @ -150cm" , 50, -100, 100);
@@ -401,7 +400,7 @@
IPlotter plotter_track_ext2 = af.createPlotterFactory().create();
plotter_track_ext2.createRegions(2,3,0);
plotter_track_ext2.setTitle("Matched track @ Target ");
- plotterFrame.addPlotter(plotter_track_ext2);
+ //plotterFrame.addPlotter(plotter_track_ext2);
IHistogram hmTrkXAtConv_t = aida.histogram1D("Top matched track X @ -67cm" , 50, -100, 100);
IHistogram hmTrkYAtConv_t = aida.histogram1D("Top matched track Y @ -67cm" , 50, -20, 20);
IHistogram hmTrkXAtConv_b = aida.histogram1D("Bottom matched track X @ -67cm" , 50, -100, 100);
@@ -423,7 +422,7 @@
IPlotter plotter_track_ext3 = af.createPlotterFactory().create();
plotter_track_ext3.createRegions(2,3,0);
plotter_track_ext3.setTitle("Matched sel track @ Target");
- plotterFrame.addPlotter(plotter_track_ext3);
+ //plotterFrame.addPlotter(plotter_track_ext3);
IHistogram hmsTrkXAtConv_t = aida.histogram1D("Top sel matched track X @ -67cm" , 50, -100, 100);
IHistogram hmsTrkYAtConv_t = aida.histogram1D("Top sel matched track Y @ -67cm" , 50, -100, 100);
IHistogram hmsTrkXAtConv_b = aida.histogram1D("Bottom sel matched track X @ -67cm" , 50, -100, 100);
@@ -443,7 +442,7 @@
IPlotter plotter_track_ext4 = af.createPlotterFactory().create();
plotter_track_ext4.createRegions(2,3,0);
plotter_track_ext4.setTitle("Track @ Target Pos. Charge");
- plotterFrame.addPlotter(plotter_track_ext4);
+ //plotterFrame.addPlotter(plotter_track_ext4);
IHistogram hTrkXAtConvqp_t = aida.histogram1D("Top track q>0 X @ -67cm" , 50, -100, 100);
IHistogram hTrkYAtConvqp_t = aida.histogram1D("Top track q>0 Y @ -67cm" , 50, -20, 20);
IHistogram hTrkXAtConvqp_b = aida.histogram1D("Bottom track q>0 X @ -67cm" , 50, -100, 100);
@@ -476,7 +475,7 @@
IPlotter plotter_track_ext4_entr = af.createPlotterFactory().create();
plotter_track_ext4_entr.createRegions(2,3,0);
plotter_track_ext4_entr.setTitle("Track @ 0cm Pos. Charge");
- plotterFrame.addPlotter(plotter_track_ext4_entr);
+ //plotterFrame.addPlotter(plotter_track_ext4_entr);
IHistogram hTrkXAtEntrqp_t = aida.histogram1D("Top track q>0 X @ 0cm" , 50, -100, 100);
IHistogram hTrkYAtEntrqp_t = aida.histogram1D("Top track q>0 Y @ 0cm" , 50, -40, 40);
IHistogram hTrkXAtEntrqp_b = aida.histogram1D("Bottom track q>0 X @ 0cm" , 50, -100, 100);
@@ -509,7 +508,7 @@
IPlotter plotter_track_ext5 = af.createPlotterFactory().create();
plotter_track_ext5.createRegions(2,3,0);
plotter_track_ext5.setTitle("Track @ Target Neg. Charge");
- plotterFrame.addPlotter(plotter_track_ext5);
+ //plotterFrame.addPlotter(plotter_track_ext5);
IHistogram hTrkXAtConvqm_t = aida.histogram1D("Top track q<0 X @ -67cm" , 50, -100, 100);
IHistogram hTrkYAtConvqm_t = aida.histogram1D("Top track q<0 Y @ -67cm" , 50, -20, 20);
IHistogram hTrkXAtConvqm_b = aida.histogram1D("Bottom track q<0 X @ -67cm" , 50, -100, 100);
@@ -540,7 +539,7 @@
IPlotter plotter_track_ext5_entr = af.createPlotterFactory().create();
plotter_track_ext5_entr.createRegions(2,3,0);
plotter_track_ext5_entr.setTitle("Track @ 0cm Neg. Charge");
- plotterFrame.addPlotter(plotter_track_ext5_entr);
+ //plotterFrame.addPlotter(plotter_track_ext5_entr);
IHistogram hTrkXAtEntrqm_t = aida.histogram1D("Top track q<0 X @ 0cm" , 50, -100, 100);
IHistogram hTrkYAtEntrqm_t = aida.histogram1D("Top track q<0 Y @ 0cm" , 50, -40, 40);
IHistogram hTrkXAtEntrqm_b = aida.histogram1D("Bottom track q<0 X @ 0cm" , 50, -100, 100);
@@ -578,7 +577,7 @@
IPlotter plotter_track_ext6 = af.createPlotterFactory().create();
plotter_track_ext6.createRegions(2,3,0);
plotter_track_ext6.setTitle("Matched Track @ Target Pos. Charge");
- plotterFrame.addPlotter(plotter_track_ext6);
+ //plotterFrame.addPlotter(plotter_track_ext6);
IHistogram hmTrkXAtConvqp_t = aida.histogram1D("Top matched track q>0 X @ -67cm" , 50, -100, 100);
IHistogram hmTrkYAtConvqp_t = aida.histogram1D("Top matched track q>0 Y @ -67cm" , 50, -20, 20);
IHistogram hmTrkXAtConvqp_b = aida.histogram1D("Bottom matched track q>0 X @ -67cm" , 50, -100, 100);
@@ -595,7 +594,7 @@
IPlotter plotter_track_ext7 = af.createPlotterFactory().create();
plotter_track_ext7.createRegions(2,3,0);
plotter_track_ext7.setTitle("Matched Track @ Target Neg. Charge");
- plotterFrame.addPlotter(plotter_track_ext7);
+ //plotterFrame.addPlotter(plotter_track_ext7);
IHistogram hmTrkXAtConvqm_t = aida.histogram1D("Top matched track q<0 X @ -67cm" , 50, -100, 100);
IHistogram hmTrkYAtConvqm_t = aida.histogram1D("Top matched track q<0 Y @ -67cm" , 50, -20, 20);
IHistogram hmTrkXAtConvqm_b = aida.histogram1D("Bottom matched track q<0 X @ -67cm" , 50, -100, 100);
@@ -616,7 +615,7 @@
IPlotter plotter_track_chi2 = af.createPlotterFactory().create();
plotter_track_chi2.createRegions(3,3,0);
plotter_track_chi2.setTitle("Track Chi2");
- plotterFrame.addPlotter(plotter_track_chi2);
+ //plotterFrame.addPlotter(plotter_track_chi2);
IHistogram hChi2_t = aida.histogram1D("Top track Chi2" , 50, 0, 15);
IHistogram hChi2_b = aida.histogram1D("Bottom track Chi2" , 50, 0, 15);
IHistogram hChi2_a = aida.histogram1D("Track Chi2" , 50, 0, 15);
@@ -642,7 +641,7 @@
IPlotter plotter_track_chi2_2 = af.createPlotterFactory().create();
plotter_track_chi2_2.createRegions(3,3,0);
plotter_track_chi2_2.setTitle("Track Chi2 Target Outliers X");
- plotterFrame.addPlotter(plotter_track_chi2_2);
+ //plotterFrame.addPlotter(plotter_track_chi2_2);
IHistogram hChi2TX_t = aida.histogram1D("Top track !target in X Chi2" , 50, 0, 15);
IHistogram hChi2TX_b = aida.histogram1D("Bottom track !target in X Chi2" , 50, 0, 15);
IHistogram hChi2TX_a = aida.histogram1D("Track !target in X Chi2" , 50, 0, 15);
@@ -682,7 +681,7 @@
IPlotter plotter_ecal_clsxm = af.createPlotterFactory().create();
plotter_ecal_clsxm.createRegions(2,3,0);
plotter_ecal_clsxm.setTitle("Ecal Cluster size matched");
- plotterFrame.addPlotter(plotter_ecal_clsxm);
+ //plotterFrame.addPlotter(plotter_ecal_clsxm);
plotter_ecal_clsxm.region(0).plot(hmcls_t);
plotter_ecal_clsxm.region(1).plot(hmcls_b);
@@ -708,7 +707,7 @@
IPlotter plotter_ecal_clsxm2 = af.createPlotterFactory().create();
plotter_ecal_clsxm2.createRegions(2,3,0);
plotter_ecal_clsxm2.setTitle("Ecal Cluster size matched Trk Pz");
- plotterFrame.addPlotter(plotter_ecal_clsxm2);
+ //plotterFrame.addPlotter(plotter_ecal_clsxm2);
plotter_ecal_clsxm2.region(0).plot(hmHMcls_t);
plotter_ecal_clsxm2.region(1).plot(hmHMcls_b);
@@ -733,7 +732,7 @@
IPlotter plotter_nclmatch = af.createPlotterFactory().create();
plotter_nclmatch.createRegions(2,3,0);
plotter_nclmatch.setTitle("Ecal track match # dR<20.0");
- plotterFrame.addPlotter(plotter_nclmatch);
+ //plotterFrame.addPlotter(plotter_nclmatch);
plotter_nclmatch.region(0).plot(hnclmatch_t);
plotter_nclmatch.region(1).plot(hnclmatch_b);
plotter_nclmatch.region(2).plot(hnclmatch_a);
@@ -753,7 +752,7 @@
IPlotter plotter_nclmatchY = af.createPlotterFactory().create();
plotter_nclmatchY.createRegions(2,3,0);
plotter_nclmatchY.setTitle("Ecal track match # dY<20.0");
- plotterFrame.addPlotter(plotter_nclmatchY);
+ //plotterFrame.addPlotter(plotter_nclmatchY);
plotter_nclmatchY.region(0).plot(hnclmatchY_t);
plotter_nclmatchY.region(1).plot(hnclmatchY_b);
plotter_nclmatchY.region(2).plot(hnclmatchY_a);
@@ -767,7 +766,7 @@
plotter_clmatchpos.createRegions(2,3,0);
plotter_clmatchpos.setTitle("Cluster track match pos");
plotter_clmatchpos.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_clmatchpos);
+ //plotterFrame.addPlotter(plotter_clmatchpos);
IHistogram hclmatchpos_a = aida.histogram2D("Track matched cluster pos",51,-25.5,25.5,11,-5.5,5.5);
IHistogram hclmatchpos_t = aida.histogram2D("Track matched top cluster pos",51,-25.5,25.5,6,-0.5,5.5);
@@ -795,7 +794,7 @@
IPlotter plotter_clunmatchpos = af.createPlotterFactory().create();
plotter_clunmatchpos.createRegions(2,3,0);
plotter_clunmatchpos.setTitle("Cluster track unmatched pos");
- plotterFrame.addPlotter(plotter_clunmatchpos);
+ //plotterFrame.addPlotter(plotter_clunmatchpos);
IHistogram hsclunmatchpos_a = aida.histogram2D("Track unmatched sel cluster pos",50,-500,500,50,-100,100);
IHistogram hsclunmatchpos_t = aida.histogram2D("Track unmatched sel top cluster pos",50,-500,500,50,-100,100);
@@ -822,7 +821,7 @@
IPlotter plotter_cln = af.createPlotterFactory().create();
plotter_cln.createRegions(2,3,0);
plotter_cln.setTitle("Cluster multiplicity");
- plotterFrame.addPlotter(plotter_cln);
+ //plotterFrame.addPlotter(plotter_cln);
IHistogram hsCln_a = aida.histogram1D("Cluster sel multiplicity",5,0,5);
IHistogram hsCln_t = aida.histogram1D("Top cluster sel multiplicity",5,0,5);
@@ -851,7 +850,7 @@
IPlotter plotter_ecal_clsx = af.createPlotterFactory().create();
plotter_ecal_clsx.createRegions(2,3,0);
plotter_ecal_clsx.setTitle("Ecal Cluster size");
- plotterFrame.addPlotter(plotter_ecal_clsx);
+ //plotterFrame.addPlotter(plotter_ecal_clsx);
@@ -898,7 +897,7 @@
IPlotter plotter_ecal_cltheta = af.createPlotterFactory().create();
plotter_ecal_cltheta.createRegions(5,3,0);
plotter_ecal_cltheta.setTitle("Ecal cl theta");
- plotterFrame.addPlotter(plotter_ecal_cltheta);
+ //plotterFrame.addPlotter(plotter_ecal_cltheta);
plotter_ecal_cltheta.region(0).plot(hth);
plotter_ecal_cltheta.region(1).plot(hth_t);
@@ -932,7 +931,7 @@
plotter_ep_x.createRegions(3,2,0);
plotter_ep_x.setTitle("E over P vs X ");
plotter_ep_x.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_x);
+ //plotterFrame.addPlotter(plotter_ep_x);
plotter_ep_x.region(0).plot(hEoverPX_t);
plotter_ep_x.region(1).plot(hEoverPX_b);
@@ -959,7 +958,7 @@
plotter_ep_x2.createRegions(2,2,0);
plotter_ep_x2.setTitle("E over P other");
plotter_ep_x2.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_x2);
+ //plotterFrame.addPlotter(plotter_ep_x2);
plotter_ep_x2.region(0).plot(hnEoverP_t);
plotter_ep_x2.region(1).plot(hnEoverP_b);
@@ -983,7 +982,7 @@
plotter_ep_xn.createRegions(2,2,0);
plotter_ep_xn.setTitle("E over P other 2");
plotter_ep_xn.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_xn);
+ //plotterFrame.addPlotter(plotter_ep_xn);
plotter_ep_xn.region(0).plot(hnEoverP2_t);
plotter_ep_xn.region(1).plot(hnEoverP2_b);
@@ -1009,7 +1008,7 @@
plotter_ep_x3.createRegions(2,2,0);
plotter_ep_x3.setTitle("E over P other Size>2");
plotter_ep_x3.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_x3);
+ //plotterFrame.addPlotter(plotter_ep_x3);
plotter_ep_x3.region(0).plot(hnlEoverPX_t);
plotter_ep_x3.region(1).plot(hnlEoverPX_b);
@@ -1031,7 +1030,7 @@
plotter_ep_x4.createRegions(1,2,0);
plotter_ep_x4.setTitle("E over P other Pz>1GeV Size>2");
plotter_ep_x4.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_x4);
+ //plotterFrame.addPlotter(plotter_ep_x4);
plotter_ep_x4.region(0).plot(hnlEoverPX2_t);
plotter_ep_x4.region(1).plot(hnlEoverPX2_b);
@@ -1123,7 +1122,7 @@
plotter_ecal_hitmap_corr.createRegions(2,3,0);
plotter_ecal_hitmap_corr.setTitle("Cluster hit map Corr");
plotter_ecal_hitmap_corr.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ecal_hitmap_corr);
+ //plotterFrame.addPlotter(plotter_ecal_hitmap_corr);
IHistogram hchm_gr = aida.histogram2D("Cluster hit map good region", 26, -25.5, 0.5, 6, -0.5, 5.5);
@@ -1182,7 +1181,7 @@
plotter_ecal_tmax.createRegions(4,2,0);
plotter_ecal_tmax.setTitle("Cluster hit pos tmax");
plotter_ecal_tmax.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ecal_tmax);
+ //plotterFrame.addPlotter(plotter_ecal_tmax);
IHistogram hposTMaxX_t = aida.histogram1D("Cluster hit X-Xcenter top", 50, -25, 25);
IHistogram hposTMaxY_t = aida.histogram1D("Cluster hit Y-Ycenter top", 50, -10, 10);
@@ -1224,14 +1223,14 @@
plotter_clEoverP.createRegions(3,3,0);
plotter_clEoverP.setTitle("EoverP");
- plotterFrame.addPlotter(plotter_clEoverP);
+ //plotterFrame.addPlotter(plotter_clEoverP);
IPlotter plotter_cltrkmatch = af.createPlotterFactory().create();
plotter_cltrkmatch.createRegions(2,3,0);
plotter_cltrkmatch.setTitle("Ecal track match");
- plotterFrame.addPlotter(plotter_cltrkmatch);
+ //plotterFrame.addPlotter(plotter_cltrkmatch);
IHistogram hdx_t = aida.histogram1D("Cluster X - track X top" , 25, -1, 500);
IHistogram hdy_t = aida.histogram1D("Cluster Y - track Y top" , 25, -1, 50);
@@ -1248,7 +1247,7 @@
plotter_cltrkmatchE = af.createPlotterFactory().create();
plotter_cltrkmatchE.createRegions(2,3,0);
plotter_cltrkmatchE.setTitle("Ecal track match efficiency");
- plotterFrame.addPlotter(plotter_cltrkmatchE);
+ //plotterFrame.addPlotter(plotter_cltrkmatchE);
plotter_cltrkmatchE.region(0).plot(hPz_t);
@@ -1367,11 +1366,11 @@
}
- if(!hide) {
+ //if(!hide) {
- plotterFrame.pack();
- plotterFrame.setVisible(true);
- }
+ // plotterFrame.pack();
+ // plotterFrame.setVisible(true);
+ //}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -21,7 +21,6 @@
import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
@@ -59,8 +58,8 @@
private double[] _error = new double[3];
- private AIDAFrame plotterFrame;
- private AIDAFrame plotterFrameSummary;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrameSummary;
private IDataPointSet dps_t;
private IDataPointSet dps_b;
private IDataPointSet dps_pull_t;
@@ -573,17 +572,17 @@
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("Residuals");
- plotterFrameSummary = new AIDAFrame();
- plotterFrameSummary.setTitle("Summary");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("Residuals");
+ //plotterFrameSummary = new AIDAFrame();
+ //plotterFrameSummary.setTitle("Summary");
List<String> sides = new ArrayList<String>(Arrays.asList("top","bottom"));
IPlotter plotter_chi2 = af.createPlotterFactory().create();
plotter_chi2.createRegions(2,2);
plotter_chi2.setTitle("Track Chi2");
- plotterFrame.addPlotter(plotter_chi2);
+ //plotterFrame.addPlotter(plotter_chi2);
ICloud1D hchi2_top = aida.cloud1D("Track Chi2 top");
ICloud1D hchi2_bot = aida.cloud1D("Track Chi2 bottom");
ICloud1D hchi2ndf_top = aida.cloud1D("Track Chi2ndf top");
@@ -695,10 +694,10 @@
}
//plotter_res.show();
- plotterFrame.addPlotter(plotter_res);
- plotterFrame.addPlotter(plotter_reserr);
- plotterFrame.addPlotter(plotter_respull);
- plotterFrame.addPlotter(plotter_respull_slope);
+ //plotterFrame.addPlotter(plotter_res);
+ //plotterFrame.addPlotter(plotter_reserr);
+ //plotterFrame.addPlotter(plotter_respull);
+ //plotterFrame.addPlotter(plotter_respull_slope);
}
@@ -728,7 +727,7 @@
((PlotterRegion) plotter_prf.region(region)).getPlot().setAllowPopupMenus(true);
}
- plotterFrameSummary.addPlotter(plotter_prf);
+ //plotterFrameSummary.addPlotter(plotter_prf);
plotter_resuydiff_t = af.createPlotterFactory().create();
@@ -750,14 +749,14 @@
((PlotterRegion) plotter_resuydiff_b.region(iLayer-1)).getPlot().setAllowPopupMenus(true);
}
- plotterFrameSummary.addPlotter(plotter_resuydiff_t);
- plotterFrameSummary.addPlotter(plotter_resuydiff_b);
+ //plotterFrameSummary.addPlotter(plotter_resuydiff_t);
+ //plotterFrameSummary.addPlotter(plotter_resuydiff_b);
- plotterFrame.pack();
- plotterFrame.setVisible(!hideFrame);
- plotterFrameSummary.pack();
- plotterFrameSummary.setVisible(!hideFrame);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(!hideFrame);
+ //plotterFrameSummary.pack();
+ //plotterFrameSummary.setVisible(!hideFrame);
}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -18,7 +18,7 @@
import org.hps.conditions.deprecated.BeamlineConstants;
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.recon.ecal.HPSEcalCluster;
-import org.hps.util.AIDAFrame;
+//import org.hps.util.AIDAFrame;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -61,8 +61,8 @@
private AIDA aida = AIDA.defaultInstance();
private IAnalysisFactory af = aida.analysisFactory();
IHistogramFactory hf = aida.histogramFactory();
- private AIDAFrame plotterFrame;
- private AIDAFrame plotterFrameTrig;
+ //private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrameTrig;
private static int nThr = 3;
private int eThr[] = {0,600,800};
@@ -94,8 +94,8 @@
// Cache ref to decoder.
dec = ecal.getIDDecoder();
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("TrigRateFrame");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("TrigRateFrame");
IPlotterStyle style;
@@ -103,32 +103,32 @@
plotter_hitmap_gr.createRegions(2,nThr+1,0);
plotter_hitmap_gr.setTitle("Cluster hit map");
plotter_hitmap_gr.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_hitmap_gr);
+ //plotterFrame.addPlotter(plotter_hitmap_gr);
IPlotter plotter_hitmap_1 = af.createPlotterFactory().create();
plotter_hitmap_1.createRegions(1);
plotter_hitmap_1.setTitle("Cluster hit map");
plotter_hitmap_1.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_hitmap_1);
+ //plotterFrame.addPlotter(plotter_hitmap_1);
IPlotter plotter_hitY_gr = af.createPlotterFactory().create();
plotter_hitY_gr.createRegions(2,nThr+1,0);
plotter_hitY_gr.setTitle("Cluster hit Y");
plotter_hitY_gr.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_hitY_gr);
+ //plotterFrame.addPlotter(plotter_hitY_gr);
IPlotter plotter_hitTheta_gr = af.createPlotterFactory().create();
plotter_hitTheta_gr.createRegions(2,nThr+1,0);
plotter_hitTheta_gr.setTitle("Cluster hit theta");
plotter_hitTheta_gr.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_hitTheta_gr);
+ //plotterFrame.addPlotter(plotter_hitTheta_gr);
IPlotter plotter_ep_gr = af.createPlotterFactory().create();
plotter_ep_gr.createRegions(2,nThr+1,0);
plotter_ep_gr.setTitle("Cluster E over p");
plotter_ep_gr.style().statisticsBoxStyle().setVisible(false);
- plotterFrame.addPlotter(plotter_ep_gr);
+ //plotterFrame.addPlotter(plotter_ep_gr);
IHistogram hm = aida.histogram2D("Cluster hit map", 52, -25.5, 25.5, 6, -5.5, 5.5);
@@ -213,15 +213,14 @@
plotter_clE.style().dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");
plotter_clE.currentRegion().plot(meanClusterEnergy);
- plotterFrame.addPlotter(plotter_clE);
+ //plotterFrame.addPlotter(plotter_clE);
- if(!hideFrame) {
-
- plotterFrame.pack();
- plotterFrame.setVisible(true);
- }
+ //if(!hideFrame) {
+ // plotterFrame.pack();
+ // plotterFrame.setVisible(true);
+ //}
java/trunk/users/src/main/java/org/hps/users/phansson
--- java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -16,7 +16,6 @@
import java.util.logging.Logger;
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.Track;
@@ -37,7 +36,7 @@
int totalTracks = 0;
private boolean _debug = false;
private AIDA aida = AIDA.defaultInstance();
- private AIDAFrame pFrame;
+ //private AIDAFrame pFrame;
IAnalysisFactory af = aida.analysisFactory();
IPlotter pPlotter;
IPlotter pPlotter2;
@@ -96,14 +95,14 @@
- pFrame = new AIDAFrame();
- pFrame.setTitle("Truth p Plots");
+ //pFrame = new AIDAFrame();
+ //pFrame.setTitle("Truth p Plots");
makePlots();
- pFrame.pack();
- pFrame.setVisible(!hideFrame);
+ //pFrame.pack();
+ //pFrame.setVisible(!hideFrame);
}
@@ -286,7 +285,7 @@
pPlotter = af.createPlotterFactory().create("Truth p Plots");
pPlotter.setTitle("Truth p Plots");
- pFrame.addPlotter(pPlotter);
+ //pFrame.addPlotter(pPlotter);
IPlotterStyle style0 = pPlotter.style();
//style0.dataStyle().fillStyle().setColor("yellow");
//style0.dataStyle().errorBarStyle().setVisible(false);
@@ -341,7 +340,7 @@
pPlotter2 = af.createPlotterFactory().create("Resolution");
pPlotter2.setTitle("Resolution");
- pFrame.addPlotter(pPlotter2);
+ //pFrame.addPlotter(pPlotter2);
style0 = pPlotter2.style();
//style0.dataStyle().fillStyle().setColor("yellow");
//style0.dataStyle().errorBarStyle().setVisible(false);
@@ -355,7 +354,7 @@
pPlotter22 = af.createPlotterFactory().create("Resolutions");
pPlotter22.setTitle("Resolutions");
- pFrame.addPlotter(pPlotter22);
+ //pFrame.addPlotter(pPlotter22);
style0 = pPlotter22.style();
//style0.dataStyle().fillStyle().setColor("yellow");
//style0.dataStyle().errorBarStyle().setVisible(false);
@@ -368,7 +367,7 @@
pPlotter3 = af.createPlotterFactory().create("Truth p Plots");
pPlotter3.setTitle("Prev BS's");
- pFrame.addPlotter(pPlotter3);
+ //pFrame.addPlotter(pPlotter3);
pPlotter3.createRegions(2, 5);
for(int i=0;i<5;++i) {
java/trunk/users/src/main/java/org/hps/users/sarah
--- java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -7,7 +7,6 @@
import java.util.List;
-import org.hps.util.AIDAFrame;
import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
@@ -21,7 +20,7 @@
*/
public class ExamplePlotter extends Driver implements Resettable {
- private AIDAFrame plotterFrame;
+ //private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
IPlotter plotter;
IAnalysisFactory fac = aida.analysisFactory();
@@ -29,8 +28,8 @@
protected void detectorChanged(Detector detector) {
aida.tree().cd("/");
- plotterFrame = new AIDAFrame();
- plotterFrame.setTitle("HPS Tracking Plots");
+ //plotterFrame = new AIDAFrame();
+ //plotterFrame.setTitle("HPS Tracking Plots");
plotter = fac.createPlotterFactory().create("HPS Tracking Plots");
plotter.setTitle("Momentum");
@@ -38,7 +37,7 @@
style.dataStyle().fillStyle().setColor("yellow");
style.dataStyle().errorBarStyle().setVisible(false);
plotter.createRegions(2, 2);
- plotterFrame.addPlotter(plotter);
+ //plotterFrame.addPlotter(plotter);
IHistogram1D trkPx = aida.histogram1D("Track Momentum (Px)", 25, -0.25, 0.25);
IHistogram1D trkPy = aida.histogram1D("Track Momentum (Py)", 25, -0.1, 0.1);
@@ -50,8 +49,8 @@
plotter.region(2).plot(trkPz);
plotter.region(3).plot(trkChi2);
- plotterFrame.pack();
- plotterFrame.setVisible(true);
+ //plotterFrame.pack();
+ //plotterFrame.setVisible(true);
}
public void process(EventHeader event) {
java/trunk/util/src/main/java/org/hps/util
--- java/trunk/util/src/main/java/org/hps/util/AIDAFrame.java 2014-06-05 16:20:53 UTC (rev 677)
+++ java/trunk/util/src/main/java/org/hps/util/AIDAFrame.java 2014-06-05 18:45:04 UTC (rev 678)
@@ -1,53 +0,0 @@
-package org.hps.util;
-
-import hep.aida.*;
-import hep.aida.ref.plotter.PlotterUtilities;
-import java.awt.BorderLayout;
-import javax.swing.*;
-
-/**
- *
- * @author Sho Uemura <[log in to unmask]>
- * @version $Id: AIDAFrame.java,v 1.1 2013/10/25 19:41:01 jeremy Exp $
- * @deprecated
- */
-@Deprecated
-public class AIDAFrame extends JFrame {
-
- JPanel controlsPanel;
- JMenuBar menubar;
- JTabbedPane tabbedPane;
-
- public AIDAFrame() {
- tabbedPane = new JTabbedPane();
- this.getContentPane().setLayout(new BorderLayout());
-
- menubar = new JMenuBar();
- this.setJMenuBar(menubar);
-
- this.add(tabbedPane, BorderLayout.CENTER);
-
- controlsPanel = new JPanel();
- controlsPanel.setLayout(new BoxLayout(controlsPanel, BoxLayout.X_AXIS));
- this.add(controlsPanel, BorderLayout.SOUTH);
- }
-
- public void addPlotter(IPlotter plotter) {
- JPanel plotterPanel = new JPanel(new BorderLayout());
- // Now embed the plotter
- plotterPanel.add(PlotterUtilities.componentForPlotter(plotter), BorderLayout.CENTER);
- tabbedPane.add(plotter.title(), plotterPanel);
- }
-
- public JTabbedPane getTabbedPane() {
- return tabbedPane;
- }
-
- public JPanel getControlsPanel() {
- return controlsPanel;
- }
-
- public JMenuBar getMenubar() {
- return menubar;
- }
-}
SVNspam 0.1
