--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java	2014-05-15 15:45:40 UTC (rev 584)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DQMDatabaseManager.java	2014-05-15 15:51:59 UTC (rev 585)
@@ -45,6 +45,7 @@

      * Class constructor, which is only package accessible.
      */
     DQMDatabaseManager() {

+        System.out.println("Making the instance of DQMDatabaseManager");

             
     }
 

--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java	2014-05-15 15:45:40 UTC (rev 584)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java	2014-05-15 15:51:59 UTC (rev 585)
@@ -8,9 +8,11 @@

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

- * sort of an interface for DQM analysis drivers
- * creates the DQM database manager, checks whether row exists in db etc

+ * sort of an interface for DQM analysis drivers creates the DQM database
+ * manager, checks whether row exists in db etc
+ *

  * @author mgraham on Apr 15, 2014

+ * update mgraham on May 15, 2014 to include calculateEndOfRunQuantities & printDQMData i.e. useful methods

  */
 public class DataQualityMonitor extends Driver {
 

@@ -19,6 +21,7 @@

     public String recoVersion = "v0.0";
     public static int runNumber = 1350;
     public boolean overwriteDB = false;

+    public boolean connectToDB = false;

 
     public void setRecoVersion(String recoVersion) {
         this.recoVersion = recoVersion;

@@ -28,31 +31,39 @@

         this.overwriteDB = overwrite;
     }
 

+    public void setConnectToDB(boolean connect) {
+        this.overwriteDB = connect;
+    }
+

     public void DataQualityMonitor() {
 
     }
 
     public void endOfData() {

-        manager = DQMDatabaseManager.getInstance();

+        if (connectToDB) {
+            manager = DQMDatabaseManager.getInstance();

         //fill any plots that only get filled at end of data...e.g. SVT occupancy plots

-        fillEndOfRunPlots();

-        //check to see if I need to make a new db entry
-        boolean entryExists = false;
-        try {
-            entryExists = checkRowExists();
-            if(entryExists)System.out.println("Found an existing run/reco entry in the dqm database");
-        } catch (SQLException ex) {
-            Logger.getLogger(DataQualityMonitor.class.getName()).log(Level.SEVERE, null, ex);

+            //check to see if I need to make a new db entry
+            boolean entryExists = false;
+            try {
+                entryExists = checkRowExists();
+                if (entryExists)
+                    System.out.println("Found an existing run/reco entry in the dqm database");
+            } catch (SQLException ex) {
+                Logger.getLogger(DataQualityMonitor.class.getName()).log(Level.SEVERE, null, ex);
+            }
+
+            if (!entryExists)
+                makeNewRow();
+            else if (!overwriteDB)
+                return; //entry exists and I don't want to overwrite
+            dumpDQMData();

         }
 

-        if (!entryExists)
-            makeNewRow();
-        else
-            if (!overwriteDB)
-                return; //entry exists and I don't want to overwrite
-        
-        dumpDQMData();

+        calculateEndOfRunQuantities();
+        fillEndOfRunPlots();
+        printDQMData();

     }
 
     private void makeNewRow() {

@@ -76,14 +87,27 @@

     }
 
     public String getRunRecoString() {

-        return "run=" + runNumber + " and recoversion='"+recoVersion+"'";

+        return "run=" + runNumber + " and recoversion='" + recoVersion + "'";

     }
 
     //override this method to do something interesting   

+    //like fill some plots that you only want to fill at end of data (e.g. for occupancies)

     public void fillEndOfRunPlots() {
     }

+

     //override this method to do something interesting   

+    //like calculate averages etc. that can then be put in the db  
+    public void calculateEndOfRunQuantities() {
+    }
+
+    
+//override this method to do something interesting   
+    //like write the DQM data to the database

     public void dumpDQMData() {
     }
 

+    //override this method to do something interesting   
+    //like print the DQM data log file
+    public void printDQMData() {
+    }

 }

--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java	2014-05-15 15:45:40 UTC (rev 584)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMonitoring.java	2014-05-15 15:51:59 UTC (rev 585)
@@ -1,11 +1,63 @@

 package org.hps.analysis.dataquality;
 

+import hep.aida.IHistogram1D;
+import java.util.HashMap;
+import java.util.Map;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawCalorimeterHit;
+import org.lcsim.event.ReconstructedParticle;
+import org.lcsim.geometry.Detector;

+

 /**
  *

- * @author mgraham on Mar 28, 2014

+ * @author mgraham on Mar 28, 2014...just added empty (almost) file into svn
+ * May 14, 2014 put some DQM template stuff in...ECal-ers should really fill in the guts 

  */
 

-public class EcalMonitoring {

+public class EcalMonitoring extends DataQualityMonitor {
+    String readoutHitCollectionName="EcalReadoutHits";//these are in ADC counts
+    String calibratedHitCollectionName="EcalCalHits";//these are in energy
+    String clusterCollectionName = "EcalClusters";

+    private Map<String, Double> monitoredQuantityMap = new HashMap<>();
+    String[] ecalQuantNames = {"Good","Stuff","For","ECAL"};
+    
+     protected void detectorChanged(Detector detector) {
+        System.out.println("EcalMonitoring::detectorChanged  Setting up the plotter");
+        aida.tree().cd("/");
+
+        //make some cool plots that will get saved in root format...2D is good too!
+        IHistogram1D energy = aida.histogram1D("Cluster Energy", 25, 0, 2.5);
+  
+    }
+     @Override
+    public void process(EventHeader event) {
+        /*  make sure everything is there */
+        if (!event.hasCollection(RawCalorimeterHit.class, readoutHitCollectionName))
+            return;
+        
+        
+    }
+
+    
+    @Override
+    public void dumpDQMData() {
+        System.out.println("EcalMonitoring::endOfData filling DQM database");
+    }
+
+    @Override
+    public void printDQMData() {
+        System.out.println("EcalMonitoring::printDQMData");
+       
+        System.out.println("*******************************");
+    }
+
+    /**
+     * Calculate the averages here and fill the map
+     */
+    @Override
+    public void calculateEndOfRunQuantities() {
+    }
+    

 }

--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java	2014-05-15 15:45:40 UTC (rev 584)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java	2014-05-15 15:51:59 UTC (rev 585)
@@ -1,10 +1,7 @@

 package org.hps.analysis.dataquality;
 

-import hep.aida.IAnalysisFactory;
-import hep.aida.IFitFactory;

 import hep.aida.IHistogram1D;
 import hep.aida.IPlotter;

-import hep.aida.IPlotterStyle;

 import org.lcsim.geometry.Detector;
 import java.util.HashMap;
 import java.util.List;

@@ -15,7 +12,7 @@

 import org.lcsim.event.RawTrackerHit;
 
 /**

- * DQM driver for the monte carlo for reconstructed track quantities

+ *  DQM driver for the monte carlo for reconstructed track quantities

  *  plots things like occupancy, t0, amplitude, chi^2 (from APV25 sampling fit); each on a per/sensor basis
  * saves to DQM database:  <occupancy> 
  * @author mgraham on Mar 28, 2014

@@ -165,6 +162,7 @@

                     sensorHist.fill(i, stripOccupancy);
                 avg += stripOccupancy;
             }

+        //do the end-of-run quantities here too since we've already done the loop.  

             avg /= strips.length;        
             avgOccupancyMap.put(sensor.getName(), avg);
         }

@@ -175,13 +173,14 @@

         System.out.println("SvtMonitoring::endOfData filling DQM database");
         double s1occ = 0.99;
         String put = "update dqm SET avgOcc_T1=" + s1occ + " WHERE " + getRunRecoString();

-//        manager.updateQuery(put);
-        printDQMData();

+//        manager.updateQuery(put);        

     }
 

+    @Override

     public void printDQMData() {
         for (SiSensor sensor : sensors) {
             System.out.println(avgOccupancyNames.get(sensor.getName()) + ":  " + avgOccupancyMap.get(sensor.getName()));
         }
     }

+      

 }

--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java	2014-05-15 15:45:40 UTC (rev 584)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java	2014-05-15 15:51:59 UTC (rev 585)
@@ -15,7 +15,7 @@

 import org.lcsim.geometry.IDDecoder;
 
 /**

- *  DQM driver for the monte carlo for reconstructed track quantities

+ *  DQM driver  for reconstructed track quantities

  *  plots things like number of tracks/event, momentum, chi^2, track parameters (d0/z0/theta/phi/curvature)
  *  @author mgraham on Mar 28, 2014
  */

@@ -96,14 +96,14 @@

         List<Track> tracks = event.get(Track.class, trackCollectionName);
         aida.histogram1D("Tracks per Event").fill(tracks.size());
         for (Track trk : tracks) {

-

+            //  fill momentum in ReconMonitoring instead...

             aida.histogram1D("Track Momentum (Px)").fill(trk.getPY());
             aida.histogram1D("Track Momentum (Py)").fill(trk.getPZ());
             aida.histogram1D("Track Momentum (Pz)").fill(trk.getPX());
             aida.histogram1D("Track Chi2").fill(trk.getChi2());
 
             aida.histogram1D("Hits per Track").fill(trk.getTrackerHits().size());

-

+            //why is getTrackParameter depricated?  How am  I supposed to get this? 

             aida.histogram1D("d0 ").fill(trk.getTrackParameter(LCIOParameters.ParameterName.d0.ordinal()));
             aida.histogram1D("sinphi ").fill(Math.sin(trk.getTrackParameter(LCIOParameters.ParameterName.phi0.ordinal())));
             aida.histogram1D("omega ").fill(trk.getTrackParameter(LCIOParameters.ParameterName.omega.ordinal()));