LISTSERV 16.5 - HPS-SVN Archives

java/branches/hps-java_ecal-commissioning/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots

EcalEventDisplay.java 1172 -> 1173

--- java/branches/hps-java_ecal-commissioning/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java	2014-10-11 16:16:23 UTC (rev 1172)
+++ java/branches/hps-java_ecal-commissioning/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java	2014-10-11 17:33:20 UTC (rev 1173)
@@ -29,7 +29,7 @@

 import org.lcsim.util.aida.AIDA;
 
 /**

- *  The driver <code>EcalLEDCommissioning</code> implements the histogram shown to the user

+ *  The driver <code>EcalEventDisplay</code> implements the histogram shown to the user

  * in the fifth tab of the Monitoring Application, when using the Ecal monitoring lcsim file.
  * IT ALSO OPENS KYLE's EVENT DISPLAY <code>PEventViewer</code>.
  * The implementation is as follows:

@@ -42,7 +42,7 @@

  *  *
  */

-public class EcalLedCommissioning extends Driver implements CrystalListener, ActionListener {

+public class EcalEventDisplay extends Driver implements CrystalListener, ActionListener {

 
   
     String inputCollection = "EcalCalHits";

@@ -62,7 +62,17 @@

     int[] windowRaw=new int[47*11];//in case we have the raw waveform, this is the window lenght (in samples)
 	boolean[] isFirstRaw=new boolean[47*11];

-    private PEventViewer viewer; //this is the Kyle event viewer.

+	/*this is the flag that checks if the event display enables to look at FADC 20, ch 13,14,15.
+	These are FADC channels not connected to any crystal. But,
+	-For ECAL TOP:
+		 at ch 13 cosmic counter 1,
+		 at ch 14 comsic counter 2,
+		 at ch 14 led
+	-For ECAL BOTTOM:
+		nothing at the moment*/
+	boolean enableAllFadc=false; 
+    
+	private PEventViewer viewer; //this is the Kyle event viewer.

 
     
     ArrayList<IHistogram1D> channelEnergyPlot;

@@ -76,10 +86,14 @@

     
     double maxEch = 2500 * ECalUtils.MeV;

-    public EcalLedCommissioning() {

+    public EcalEventDisplay() {

+    public void setEnableAllFadc(boolean enableAllFadc){
+        this.enableAllFadc = enableAllFadc;
+    }
+

     public void setMaxEch(double maxEch) {
         this.maxEch = maxEch;
     }

@@ -119,7 +133,6 @@

        //channelRawWaveform=new ArrayList<ICloud1D>();
        channelTimeVsEnergyPlot=new ArrayList<IHistogram2D>();
        //create the histograms for single channel energy and time distribution.

-       //these are NOT shown in this plotter, but are used in the event display.

        for(int ii = 0; ii < (47*11); ii = ii +1){
              int row=ECalUtils.getRowFromHistoID(ii);
              int column=ECalUtils.getColumnFromHistoID(ii);

@@ -246,21 +259,24 @@

         	for (RawTrackerHit hit : hits) {
         		 row=hit.getIdentifierFieldValue("iy");
                  column=hit.getIdentifierFieldValue("ix");

-                 if ((row!=0)&&(column!=0)&&(!ECalUtils.isInHole(row,column))){
-                     ii = ECalUtils.getHistoIDFromRowColumn(row,column);
-                     if (isFirstRaw[ii]){ //at the very first hit we read for this channel, we need to read the window length and save it
-                    	 isFirstRaw[ii]=false;
-                    	 windowRaw[ii]=hit.getADCValues().length;                   	 
-                    	 channelRawWaveform.set(ii,aida.histogram1D(detector.getDetectorName() + " : " + inputCollectionRaw + " : Raw Waveform : " + (column) + " "+ (row)+ ": "+ii,windowRaw[ii],-0.5*ECalUtils.ecalReadoutPeriod,(-0.5+windowRaw[ii])*ECalUtils.ecalReadoutPeriod));
-                     }
-                     if (do_update){
-                         channelRawWaveform.get(ii).reset();                     
-                         for (int jj = 0; jj < windowRaw[ii]; jj++) {
-                             channelRawWaveform.get(ii).fill(jj*ECalUtils.ecalReadoutPeriod, hit.getADCValues()[jj]*ECalUtils.adcResolution*1000);
-                         }                  
-                         result=ECalUtils.computeAmplitude(hit.getADCValues(),windowRaw[ii],pedSamples);
-                         channelRawWaveform.get(ii).setTitle("Ampl: "+String.format("%.2f",result[0])+" mV , ped : "+String.format("%.2f",result[1])+" "+String.format("%.2f",result[2])+" ADC counts");
-                     }

+                 if ((row!=0)&&(column!=0)){
+                	 if (!ECalUtils.isInHole(row,column)||(enableAllFadc)){
+                	 
+                		 ii = ECalUtils.getHistoIDFromRowColumn(row,column);
+                		 if (isFirstRaw[ii]){ //at the very first hit we read for this channel, we need to read the window length and save it
+                			 isFirstRaw[ii]=false;
+                			 windowRaw[ii]=hit.getADCValues().length;                   	 
+                			 channelRawWaveform.set(ii,aida.histogram1D(detector.getDetectorName() + " : " + inputCollectionRaw + " : Raw Waveform : " + (column) + " "+ (row)+ ": "+ii,windowRaw[ii],-0.5*ECalUtils.ecalReadoutPeriod,(-0.5+windowRaw[ii])*ECalUtils.ecalReadoutPeriod));
+                		 }
+                		 if (do_update){
+                			 channelRawWaveform.get(ii).reset();                     
+                			 for (int jj = 0; jj < windowRaw[ii]; jj++) {
+                				 channelRawWaveform.get(ii).fill(jj*ECalUtils.ecalReadoutPeriod, hit.getADCValues()[jj]*ECalUtils.adcResolution*1000);
+                			 }                  
+                			 result=ECalUtils.computeAmplitude(hit.getADCValues(),windowRaw[ii],pedSamples);
+                			 channelRawWaveform.get(ii).setTitle("Ampl: "+String.format("%.2f",result[0])+" mV , ped : "+String.format("%.2f",result[1])+" "+String.format("%.2f",result[2])+" ADC counts");
+                		 } 
+                	 }

                  }
             }
         }

@@ -319,52 +335,47 @@

     	itmpx=(int) ecalPoint.getX(); //column
     	itmpy=(int) ecalPoint.getY(); //row

-    	if ((itmpx!=0)&&(itmpy!=0)&&(!ECalUtils.isInHole(itmpy,itmpx))){
-    		ix=itmpx;
-    		iy=itmpy;
-    	    id=ECalUtils.getHistoIDFromRowColumn(iy,ix);
-    	    System.out.println("Crystal event: "+ix+" "+iy+" "+id);

+    	if ((itmpx!=0)&&(itmpy!=0))
+    		if (!ECalUtils.isInHole(itmpy,itmpx)||(enableAllFadc)){
+    			ix=itmpx;
+    			iy=itmpy;
+    			id=ECalUtils.getHistoIDFromRowColumn(iy,ix);
+    			System.out.println("Crystal event: "+ix+" "+iy+" "+id);

-        	plotter.region(0).clear();
-            pstyle.xAxisStyle().setLabel("Hit energy (GeV)");
-            pstyle.yAxisStyle().setLabel("");
-            plotter.region(0).plot(channelEnergyPlot.get(id),pstyle);

+    			plotter.region(0).clear();
+    			pstyle.xAxisStyle().setLabel("Hit energy (GeV)");
+    			pstyle.yAxisStyle().setLabel("");
+    			plotter.region(0).plot(channelEnergyPlot.get(id),pstyle);

-        	plotter.region(1).clear();
-            pstyle.xAxisStyle().setLabel("Hit Time (ns)");
-            pstyle.yAxisStyle().setLabel("");    
-            plotter.region(1).plot(channelTimePlot.get(id),pstyle);

+    			plotter.region(1).clear();
+    			pstyle.xAxisStyle().setLabel("Hit Time (ns)");
+    			pstyle.yAxisStyle().setLabel("");    
+    			plotter.region(1).plot(channelTimePlot.get(id),pstyle);

-            plotter.region(2).clear();
-            pstyle.xAxisStyle().setLabel("Hit Time (ns)");
-            pstyle.yAxisStyle().setLabel("Hit Energy (GeV)");    
-        	plotter.region(2).plot(channelTimeVsEnergyPlot.get(id),pstyle);

+    			plotter.region(2).clear();
+    			pstyle.xAxisStyle().setLabel("Hit Time (ns)");
+    			pstyle.yAxisStyle().setLabel("Hit Energy (GeV)");    
+    			plotter.region(2).plot(channelTimeVsEnergyPlot.get(id),pstyle);

-        	plotter.region(3).clear();

+    			plotter.region(3).clear();

-    	    if (!isFirstRaw[id]){
-    	        pstyle.yAxisStyle().setLabel("Signal amplitude (mV)");
-    	        pstyle.xAxisStyle().setLabel("Time (ns)");
-    	        pstyle.dataStyle().fillStyle().setColor("orange");
-    	        pstyle.dataStyle().markerStyle().setColor("orange");
-    	        pstyle.dataStyle().errorBarStyle().setVisible(false);
-    	    }
-    	    else{
-    	    	pstyle.xAxisStyle().setLabel("Hit Energy (GeV)");    
-                pstyle.yAxisStyle().setLabel("");  	    
-    	    }
-    	    plotter.region(3).plot(channelRawWaveform.get(id),pstyle);
-        
-
-    	    
- 
-         
-

+    			if (!isFirstRaw[id]){
+    				pstyle.yAxisStyle().setLabel("Signal amplitude (mV)");
+    				pstyle.xAxisStyle().setLabel("Time (ns)");
+    				pstyle.dataStyle().fillStyle().setColor("orange");
+    				pstyle.dataStyle().markerStyle().setColor("orange");
+    				pstyle.dataStyle().errorBarStyle().setVisible(false);
+    			}
+    			else{
+    				pstyle.xAxisStyle().setLabel("Hit Energy (GeV)");    
+    				pstyle.yAxisStyle().setLabel("");  	    
+    			}
+    			plotter.region(3).plot(channelRawWaveform.get(id),pstyle);

     	}
     }

Commit in `java/branches/hps-java_ecal-commissioning` on MAIN
`conditions/src/main/resources/HPS-ECalCommissioning/calibECal/default.gain`	+8		1172 -> 1173
`conditions/src/main/resources/HPS-ECalCommissioning/daqmap/ecal.txt`	+9	-8	1172 -> 1173
`detector-data/detectors/HPS-ECalCommissioning/compact.xml`	+1	-1	1172 -> 1173
`ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java`	+20	-10	1172 -> 1173
`/EcalRawConverter.java`	+6	-1	1172 -> 1173
`evio/src/main/java/org/hps/evio/ECalEvioReader.java`	+11	-19	1172 -> 1173
`/EventConstants.java`	+2	-2	1172 -> 1173
`monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java`	+67	-56	1172 -> 1173
`record-util/pom.xml`	+4	-2	1172 -> 1173
`record-util/src/main/java/org/hps/record/et/EtConnection.java`	+5	-5	1172 -> 1173
`steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim`	+3	-2	1172 -> 1173
`/EcalMonitoringFinal.lcsim`	+2	-1	1172 -> 1173
	+138	-107