java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java 2014-05-01 08:36:27 UTC (rev 537)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java 2014-05-01 10:02:51 UTC (rev 538)
@@ -109,8 +109,8 @@
hEnergyDraw=aida.histogram1D("Energy",channelEnergyPlot.get(0).axis().bins(), channelEnergyPlot.get(0).axis().lowerEdge(),channelEnergyPlot.get(0).axis().upperEdge());
hTimeDraw=aida.histogram1D("Time", channelTimePlot.get(0).axis().bins(),channelTimePlot.get(0).axis().lowerEdge(),channelTimePlot.get(0).axis().upperEdge());
- //hTimeVsEnergyDraw=aida.histogram2D("Hit Time Vs Energy" ,channelTimeVsEnergyPlot.get(0).xAxis().bins(),channelTimeVsEnergyPlot.get(0).xAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).xAxis().upperEdge(),channelTimeVsEnergyPlot.get(0).yAxis().bins(),channelTimeVsEnergyPlot.get(0).yAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).yAxis().upperEdge());
- hTimeVsEnergyDraw=aida.histogram2D("Time Vs Energy",100,0,400,100,-0.1,maxEch);
+ hTimeVsEnergyDraw=aida.histogram2D("Hit Time Vs Energy" ,channelTimeVsEnergyPlot.get(0).xAxis().bins(),channelTimeVsEnergyPlot.get(0).xAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).xAxis().upperEdge(),channelTimeVsEnergyPlot.get(0).yAxis().bins(),channelTimeVsEnergyPlot.get(0).yAxis().lowerEdge(),channelTimeVsEnergyPlot.get(0).yAxis().upperEdge());
+ //hTimeVsEnergyDraw=aida.histogram2D("Time Vs Energy",100,0,400,100,-0.1,maxEch);
@@ -180,10 +180,13 @@
if (do_update) viewer.addHit(new EcalHit(column,row, hit.getRawEnergy()));
if ((row!=0)&&(column!=0)){
ii = EcalMonitoringUtils.getHistoIDFromRowColumn(row,column);
- channelEnergyPlot.get(ii).fill(hit.getCorrectedEnergy());
- channelTimePlot.get(ii).fill(hit.getTime());
- channelTimeVsEnergyPlot.get(ii).fill(hit.getTime(),hit.getRawEnergy());
- }
+ if (hit.getCorrectedEnergy() > 0) { //A.C. > 0 for the 2D plot drawing
+ channelEnergyPlot.get(ii).fill(hit.getCorrectedEnergy());
+ channelTimePlot.get(ii).fill(hit.getTime());
+ //channelTimeVsEnergyPlot.get(ii).fill(hit.getTime(),hit.getCorrectedEnergy());
+ channelTimeVsEnergyPlot.get(ii).fill(hit.getTime(),1.);
+ }
+ }
}
}
if (event.hasCollection(HPSEcalCluster.class, clusterCollection)) {
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringCelentan.lcsim 2014-05-01 08:36:27 UTC (rev 537)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringCelentan.lcsim 2014-05-01 10:02:51 UTC (rev 538)
@@ -1,115 +0,0 @@
-
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- <control>
- <numberOfEvents>-1</numberOfEvents>
- <printInputFiles>true</printInputFiles>
- <printDriversDetailed>true</printDriversDetailed>
- </control>
- <execute>
- <driver name="EventMarkerDriver"/>
- <driver name="ConditionsDriver"/>
- <driver name="CalibrationDriver"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalMonitoringPlots"/> <!-- General plots -->
- <driver name="EcalHitPlots"/> <!-- Single hit distributions -->
- <driver name="EcalClusterPlots"/> <!-- Clusters distributions -->
- <driver name="EcalDaqPlots"/> <!-- DAQ Plots -->
- <driver name="EcalEventDisplay"/> <!-- Ecal event display -->
-
-
-<!-- <driver name="EcalWindowPlots"/> -->
-
-<!-- <driver name="EcalEvsX"/> -->
-<!-- <driver name="TriggerPlots"/>-->
-<!--
- <driver name="EcalEventMonitor"/>
- <driver name="EcalDaqPlots"/>
--->
-<!-- <driver name="RunControlDriver" />-->
- <!--<driver name="AidaSaveDriver"/>-->
- </execute>
-
-<!-- Here starts the drivers description -->
- <drivers>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
- </driver>
-
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <conditionsReaderClass>org.hps.conditions.deprecated.TestRunConditionsReader</conditionsReaderClass>
- </driver>
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
-
- <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-<!-- <threshold>150</threshold>-->
- <applyBadCrystalMap>false</applyBadCrystalMap>
-<!-- <dropBadFADC>true</dropBadFADC>-->
- </driver>
-
- <!-- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">-->
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC">
-<!-- <clusterWindow>32.0</clusterWindow>-->
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
-
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
- <inputCollection>EcalCalHits</inputCollection>
- <eventRefreshRate>100</eventRefreshRate>
- </driver>
-
- <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
- <maxE>2.0</maxE>
- <logScale>true</logScale>
- </driver>
-
- <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
- <maxE>2.0</maxE>
- <logScale>false</logScale>
- </driver>
-
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
- <inputCollection>EcalCalHits</inputCollection>
- </driver>
-
- <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
- <inputCollection>EcalCalHits</inputCollection>
- <maxEch>2.0</maxEch>
- <eventRefreshRate>100</eventRefreshRate>
- </driver>
-
-
-<!-- Here are commented drivers -->
- <!--<driver name="RunControlDriver" type="org.hps.util.RunControlDriver"> -->
-
- <!--<driver name="EcalClusterer" type="org.hps.recon.ecal.HPSEcalCTPClusterer"> -->
-
- <!-- <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
- <targetZ>674</targetZ>
- <inputCollection>EcalClusters</inputCollection>
- </driver> -->
-
- <!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.plots.EcalWindowPlots">
- <inputCollection>EcalReadoutHits</inputCollection>
- </driver> -->
-
- <!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
- <inputCollection>EcalCalHits</inputCollection>
- <eventRefreshRate>100</eventRefreshRate>
- </driver>-->
-
-
- <!-- <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
- <clusterEnergyCut>0.500</clusterEnergyCut>
- </driver>-->
-
- <!-- <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>triggerEPlots</outputFileName>
- </driver> -->
-
-
- </drivers>
-</lcsim>
