Print

Print


Commit in SlicDiagnostics on MAIN
test.properties+2-21.5 -> 1.6
src/org/lcsim/slic/diagnostics/SlicDiagnosticsDriver.java+4-11.31 -> 1.32
src/org/lcsim/slic/diagnostics/calorimeterhit/CalorimeterHitPlots.java+1-31.4 -> 1.5
                                             /CalorimeterPlotsNoDetector.java+1-21.5 -> 1.6
src/org/lcsim/slic/diagnostics/util/DirectoryMaker.java+11.1 -> 1.2
+9-8
5 modified files


SlicDiagnostics
test.properties 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- test.properties	29 Apr 2008 19:05:52 -0000	1.5
+++ test.properties	4 Jun 2009 18:16:41 -0000	1.6
@@ -15,10 +15,10 @@
 cluster.clusterPlots=true
 cluster.cheatClusters=true
 
-config.maxEvents=20
+config.maxEvents=1
 config.eventNoticeInterval=1
 config.verbosity=4
-config.convertClouds=false
+config.convertClouds=true
 config.autoname=false
 config.saveAsZip=true
 config.outputDir=.

SlicDiagnostics/src/org/lcsim/slic/diagnostics
SlicDiagnosticsDriver.java 1.31 -> 1.32
diff -u -r1.31 -r1.32
--- SlicDiagnosticsDriver.java	29 Apr 2008 19:05:52 -0000	1.31
+++ SlicDiagnosticsDriver.java	4 Jun 2009 18:16:41 -0000	1.32
@@ -244,7 +244,10 @@
             add(new Cloud2HistogramConverter());
         }
         
-        add(new CalorimeterPlotsNoDetectorDriver(this));     
+        if (_options.getBooleanOption("calorimeter.nodet"))
+        {
+        	add(new CalorimeterPlotsNoDetectorDriver(this));
+        }
     }
   
     public void add(Driver subdriver)

SlicDiagnostics/src/org/lcsim/slic/diagnostics/calorimeterhit
CalorimeterHitPlots.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- CalorimeterHitPlots.java	29 Apr 2008 19:05:52 -0000	1.4
+++ CalorimeterHitPlots.java	4 Jun 2009 18:16:41 -0000	1.5
@@ -25,14 +25,12 @@
 import org.lcsim.slic.diagnostics.layer.LayerInfoDriver;
 import org.lcsim.slic.diagnostics.util.AbstractPlots;
 
-import static org.lcsim.slic.diagnostics.SlicDiagnosticsDirectories.SimCalorimeterHitDir;
-
 /**
  * A set of plots for SimCalorimeterHit collections. NOTE: Most plots on
  * collections of SimCalorimeterHits are done by GenericHitPlots.
  * 
  * @author jeremym
- * @version $Id: CalorimeterHitPlots.java,v 1.4 2008/04/29 19:05:52 jeremy Exp $
+ * @version $Id: CalorimeterHitPlots.java,v 1.5 2009/06/04 18:16:41 jeremy Exp $
  */
 public class CalorimeterHitPlots extends AbstractPlots
 {

SlicDiagnostics/src/org/lcsim/slic/diagnostics/calorimeterhit
CalorimeterPlotsNoDetector.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- CalorimeterPlotsNoDetector.java	4 Sep 2008 18:30:49 -0000	1.5
+++ CalorimeterPlotsNoDetector.java	4 Jun 2009 18:16:41 -0000	1.6
@@ -1,6 +1,5 @@
 package org.lcsim.slic.diagnostics.calorimeterhit;
 
-import org.lcsim.slic.diagnostics.util.AidaHelper;
 import static org.lcsim.slic.diagnostics.util.AidaHelper.c1d;
 import static org.lcsim.slic.diagnostics.util.AidaHelper.c2d;
 import static org.lcsim.slic.diagnostics.util.VecUtil.getCylindricalRadius;
@@ -10,7 +9,6 @@
 import hep.physics.vec.BasicHep3Vector;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;
-import org.lcsim.util.aida.AIDA;
 
 import java.util.HashSet;
 import java.util.List;
@@ -21,6 +19,7 @@
 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.EventHeader.LCMetaData;
 import org.lcsim.slic.diagnostics.util.AbstractPlots;
+import org.lcsim.slic.diagnostics.util.AidaHelper;
 
 /**
  * 

SlicDiagnostics/src/org/lcsim/slic/diagnostics/util
DirectoryMaker.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- DirectoryMaker.java	23 Jan 2007 23:27:59 -0000	1.1
+++ DirectoryMaker.java	4 Jun 2009 18:16:41 -0000	1.2
@@ -32,6 +32,7 @@
         {
             String collectionName = event.getMetaData(collection).getName();
             if (!collectionsSeen.contains(collectionName)) {
+            	//System.out.println("making dir <" + baseDir + "/" + event.getMetaData(collection).getName() + ">");
                 mkdir(baseDir + "/" + event.getMetaData(collection).getName());
                 collectionsSeen.add(collectionName);
             }
CVSspam 0.2.8