java/trunk/analysis/src/main/java/org/hps/analysis/ecal
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/BasicMonitoringPlotsDriver.java 2014-07-16 16:24:34 UTC (rev 779)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/BasicMonitoringPlotsDriver.java 2014-07-16 19:10:54 UTC (rev 780)
@@ -1,105 +0,0 @@
-package org.hps.monitoring.drivers.ecal;
-
-import hep.aida.IAnalysisFactory;
-import hep.aida.IHistogram1D;
-import hep.aida.IHistogram2D;
-import hep.aida.IHistogramFactory;
-import hep.aida.IPlotter;
-import hep.aida.IPlotterFactory;
-
-import java.util.List;
-
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.RawCalorimeterHit;
-import org.lcsim.util.Driver;
-
-/**
- * Basic ECal monitoring plots that work on Test Run data.
- * @author jeremym
- */
-public class BasicMonitoringPlotsDriver extends Driver {
-
- private String calHitsCollectionName = "EcalCalHits";
- private String rawHitsCollectionName = "EcalReadoutHits";
- private String clustersCollectionName = "EcalClusters";
-
- private IHistogram1D calHitEnergyH1D;
- private IHistogram1D clusterEnergyH1D;
- private IHistogram1D rawHitAmplitudeH1D;
- private IHistogram2D calHitEnergyMapH2D;
-
- public BasicMonitoringPlotsDriver() {
- }
-
- public void startOfData() {
-
- IAnalysisFactory.create().createHistogramFactory(null);
- IPlotterFactory plotFactory = IAnalysisFactory.create().createPlotterFactory("ECAL Monitoring");
- IHistogramFactory histogramFactory = IAnalysisFactory.create().createHistogramFactory(null);
-
- calHitEnergyH1D = histogramFactory.createHistogram1D(calHitsCollectionName + ": Energy", calHitsCollectionName + ": Energy", 200, 0.0, 2.0);
- calHitEnergyH1D.annotation().addItem("xAxisLabel", "GeV");
- calHitEnergyH1D.annotation().addItem("yAxisLabel", "Count");
- IPlotter plotter = plotFactory.create("CalorimeterHits");
- plotter.createRegion();
- plotter.style().gridStyle().setVisible(false);
- plotter.style().dataStyle().errorBarStyle().setVisible(false);
- plotter.region(0).plot(calHitEnergyH1D);
- plotter.show();
-
- rawHitAmplitudeH1D = histogramFactory.createHistogram1D(rawHitsCollectionName + ": Amplitude", rawHitsCollectionName + ": Amplitude", 150, 0.0, 15000.0);
- rawHitAmplitudeH1D.annotation().addItem("xAxisLabel", "ADC Value");
- rawHitAmplitudeH1D.annotation().addItem("yAxisLabel", "Count");
- plotter = plotFactory.create("RawCalorimeterHits");
- plotter.createRegion();
- plotter.style().gridStyle().setVisible(false);
- plotter.style().dataStyle().errorBarStyle().setVisible(false);
- plotter.region(0).plot(rawHitAmplitudeH1D);
- plotter.show();
-
- clusterEnergyH1D = histogramFactory.createHistogram1D(clustersCollectionName + ": Energy", clustersCollectionName + ": Energy", 100, 0.0, 3.0);
- clusterEnergyH1D.annotation().addItem("xAxisLabel", "GeV");
- clusterEnergyH1D.annotation().addItem("yAxisLabel", "Count");
- plotter = plotFactory.create("Clusters");
- plotter.createRegion();
- plotter.style().gridStyle().setVisible(false);
- plotter.style().dataStyle().errorBarStyle().setVisible(false);
- plotter.region(0).plot(clusterEnergyH1D);
- plotter.show();
-
- calHitEnergyMapH2D = histogramFactory.createHistogram2D(calHitsCollectionName + ": Energy Map", calHitsCollectionName + ": Energy Map", 47, -23.5, 23.5, 11, -5.5, 5.5);
- plotter = plotFactory.create("CalorimeterHit Energy Map");
- plotter.createRegion();
- plotter.style().setParameter("hist2DStyle", "colorMap");
- plotter.style().gridStyle().setVisible(false);
- plotter.region(0).plot(calHitEnergyMapH2D);
- plotter.show();
- }
-
- public void process(EventHeader event) {
-
- List<CalorimeterHit> calHits = event.get(CalorimeterHit.class, calHitsCollectionName);
- for (CalorimeterHit hit : calHits) {
- calHitEnergyH1D.fill(hit.getCorrectedEnergy());
- calHitEnergyMapH2D.fill(
- hit.getIdentifierFieldValue("ix"),
- hit.getIdentifierFieldValue("iy"),
- hit.getCorrectedEnergy());
- }
-
- List<Cluster> clusters = event.get(Cluster.class, clustersCollectionName);
- for (Cluster cluster : clusters) {
- clusterEnergyH1D.fill(cluster.getEnergy());
- }
-
- List<RawCalorimeterHit> rawHits = null;
- if (event.hasCollection(RawCalorimeterHit.class, rawHitsCollectionName)) {
- rawHits = event.get(RawCalorimeterHit.class, rawHitsCollectionName);
- for (RawCalorimeterHit hit : rawHits) {
- rawHitAmplitudeH1D.fill(hit.getAmplitude());
- }
- }
- }
-}
\ No newline at end of file
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim 2014-07-16 16:24:34 UTC (rev 779)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim 2014-07-16 19:10:54 UTC (rev 780)
@@ -1,34 +1,26 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
+ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
<driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/>
- </execute>
-
+ </execute>
<drivers>
-
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
-
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>false</use2014Gain>
- </driver>
-
+ </driver>
<driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
-
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.BasicMonitoringPlotsDriver"/>
-
+ </driver>
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver"/>
</drivers>
</lcsim>