Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN | |||
EcalCrystalFilter.java | +38 | -23 | 1.2 -> 1.3 |
Added unbiased trigger time frames.
diff -u -r1.2 -r1.3 --- EcalCrystalFilter.java 7 Jun 2012 15:06:58 -0000 1.2 +++ EcalCrystalFilter.java 8 Jun 2012 16:43:07 -0000 1.3 @@ -85,8 +85,14 @@
private JComboBox xCombo; private JComboBox yCombo; private JButton blankButton;
+ private JLabel xLabelTop, yLabelTop; + private JComboBox xComboTop; + private JComboBox yComboTop; + private JButton blankButtonTop;
private static final Integer[] xList = new Integer[46]; private static final Integer[] yList = new Integer[10];
+ private static final Integer[] xListTop = new Integer[46]; + private static final Integer[] yListTop = new Integer[10];
int eventRefreshRate = 1; int eventn = 0; boolean hide = false;
@@ -103,6 +109,7 @@
for (int i = -23; i <= 23; i++) { if (i != 0) { xList[count] = i;
+ xListTop[count] = i;
count++; } }
@@ -110,6 +117,7 @@
for (int i = -5; i <= 5; i++) { if (i != 0) { yList[count] = i;
+ yListTop[count] = i;
count++; } }
@@ -320,21 +328,21 @@
plotterFrameTop = new AIDAFrame(); plotterFrameTop.setTitle("HPS Top ECal Crystal Filter Plots");
- //xCombo = new JComboBox(xList); - //xCombo.addActionListener(this); - //xLabel = new JLabel("x"); - //xLabel.setLabelFor(xCombo); - //plotterFrameTop.getControlsPanel().add(xLabel); - //plotterFrameTop.getControlsPanel().add(xCombo); - //yCombo = new JComboBox(yList); - //yCombo.addActionListener(this); - //yLabel = new JLabel("y"); - //yLabel.setLabelFor(yCombo); - //plotterFrameTop.getControlsPanel().add(yLabel); - //plotterFrameTop.getControlsPanel().add(yCombo); - //blankButton = new JButton("Hide histogram"); - //plotterFrameTop.getControlsPanel().add(blankButton); - //blankButton.addActionListener(this);
+ xComboTop = new JComboBox(xListTop); + xComboTop.addActionListener(this); + xLabelTop = new JLabel("xT"); + xLabelTop.setLabelFor(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); + blankButtonTop = new JButton("Hide histogram (Top)"); + plotterFrameTop.getControlsPanel().add(blankButtonTop); + blankButtonTop.addActionListener(this);
// Setup the plotterTop. plotterTop = aida.analysisFactory().createPlotterFactory().create();
@@ -405,8 +413,8 @@
plotterTop2.region(2).plot(tTPlots[-5 + 23][2 + 5 - 1]); plotterTop3.region(2).plot(tTPlots[-5 + 23][2 + 5 - 1]); plotterTop4.region(2).plot(aTPlots[-5 + 23][2 + 5 - 1]);
- //xCombo.setSelectedIndex(-5 + 23); - //yCombo.setSelectedIndex(2 + 5 - 1);
+ xComboTop.setSelectedIndex(-5 + 23); + yComboTop.setSelectedIndex(2 + 5 - 1);
@@ -810,10 +818,7 @@
/* plotter3.region(2).clear(); plotter4.region(2).clear();
- plotterTop.region(2).clear(); - plotterTop2.region(2).clear(); - plotterTop3.region(2).clear(); - plotterTop4.region(2).clear();
+
*/ } else {
@@ -830,7 +835,17 @@
plotter3.region(2).plot(tPlots[x + 23][y + 5]); plotter4.region(2).clear(); plotter4.region(2).plot(aPlots[x + 23][y + 5]);
-/*
+ } + + if(ae.getSource() == blankButtonTop) { + plotterTop.region(2).clear(); + plotterTop2.region(2).clear(); + + } else { + Integer x, y; + x = (Integer) xComboTop.getSelectedItem(); + y = (Integer) yComboTop.getSelectedItem(); +
plotterTop.region(2).clear(); plotterTop.region(2).plot(aTPlots[x + 23][y + 5]); plotterTop2.region(2).clear();
@@ -841,7 +856,7 @@
plotterTop3.region(2).plot(tTPlots[x + 23][y + 5]); plotterTop4.region(2).clear(); plotterTop4.region(2).plot(aTPlots[x + 23][y + 5]);
-*/
+
} }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1