SlicDiagnostics
diff -u -r1.2 -r1.3
--- RunnerTest.properties 16 Oct 2006 19:04:40 -0000 1.2
+++ RunnerTest.properties 16 May 2007 00:48:24 -0000 1.3
@@ -1,12 +1,17 @@
-# Properties file for SlicDiagnostics
-cheatClusters: true
-clusterPlots: true
-particlePlots: true
-genericHitPlots: true
-trackerHitPlots: true
-calorimeterHitPlots: true
-eventNoticeInterval: 1
-maxEvents: 1
-verbosity: 1
-outputFile: RunnerTest
-enableAutoname: false
+tracker.generic=true
+mcparticle.generator=true
+calorimeter.event=true
+config.autoname=false
+cluster.cheatClusters=true
+mcparticle.simulator=true
+mcparticle.statusPlots=true
+calorimeter.generic=true
+mcparticle.hitPlots=true
+mcparticle.basicPlots=true
+calorimeter.hit=true
+tracker.hit=true
+cluster.clusterPlots=true
+tracker.event=true
+config.maxEvents=-1
+config.eventNoticeInterval=1
+config.verbosity=4
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.25 -r1.26
--- SlicDiagnosticsDriver.java 24 Jan 2007 00:53:37 -0000 1.25
+++ SlicDiagnosticsDriver.java 16 May 2007 00:48:25 -0000 1.26
@@ -46,7 +46,7 @@
private UserOptions _options = null;
private static AIDA _aida = AIDA.defaultInstance();
private String _fileName = null;
- private static final String _defaultFileName = "SlicDiagnosticsPlots";
+ private static final String _defaultFileName = "SlicDiagnosticsPlots.aida";
private EventHeader _currentEvent = null;
private int _verbosity = 0;
private int _evtCnt = 0;
@@ -364,4 +364,4 @@
_eventNoticeInterval = interval;
}
-}
\ No newline at end of file
+}
SlicDiagnostics/src/org/lcsim/slic/diagnostics/generichit
diff -u -r1.3 -r1.4
--- GenericHitPlots.java 24 Jan 2007 00:39:01 -0000 1.3
+++ GenericHitPlots.java 16 May 2007 00:48:25 -0000 1.4
@@ -30,7 +30,7 @@
* creates a set of plots for each layer in the subdetector.
*
* @author jeremym
- * @version $Id: GenericHitPlots.java,v 1.3 2007/01/24 00:39:01 jeremy Exp $
+ * @version $Id: GenericHitPlots.java,v 1.4 2007/05/16 00:48:25 jeremy Exp $
*/
public class GenericHitPlots extends Driver
{
@@ -104,9 +104,11 @@
plot = c1d("Hit: Time","Time (nanoseconds)","Number of Hits");
plot.annotation().addItem("yAxisScale", "log");
- c1d("Hit: log10(Time)","Time (log10(nanoseconds))","Number of Hits");
+ c1d("Hit: Time","Time [nanoseconds]","Number of Hits");
- c1d("Hit: log10(Time Average)","Average Time (log10(nanoseconds))","Number of Events");
+ //c1d("Hit: log10(Time Average)","Average Time (log10(nanoseconds))","Number of Events");
+
+ c1d("Hit: Average Time by Event", "Time [nanoseconds]", "Number of Events");
c2d("Hit: Spherical R vs log10(Time)","Spherical Radius (mm)","Time (log10(nanoseconds))");
@@ -326,7 +328,11 @@
double elog10 = log10(energy);
double ecbrt = cbrt(energy);
double time = hit.getTime();
- double timelog10 = log10(hit.getTime());
+ double timelog10 = 0;
+ if ( hit.getTime() != 0 )
+ {
+ timelog10=log10(hit.getTime());
+ }
double theta = hit.getTheta();
double phi = hit.getPhi();
int layern = hit.getLayer();
@@ -352,7 +358,7 @@
c1d("Hit: Time").fill(time);
// Fill log time
- c1d("Hit: log10(Time)").fill(timelog10);
+ //c1d("Hit: log10(Time)").fill(timelog10);
// Fill time vs spherical R
c2d("Hit: Spherical R vs log10(Time)").fill(sphR, timelog10);
@@ -520,8 +526,8 @@
c1d("Hit: Max Energy over Total").fill(maxE / eventTotE);
// Fill log10 average time
- double avgTime = log10(totTime / nhits);
- c1d("Hit: log10(Average Time by Event)").fill(avgTime);
+ double avgTime = totTime / ((double)nhits);
+ c1d("Hit: Average Time by Event").fill(avgTime);
// Fill event energy
c1d("Event: Total Energy").fill(eventTotE);
@@ -722,6 +728,7 @@
h1d("Layer: Average Total Energy").fill(i, layer.getAverageTotalEnergy(nevents));
// Fill average n hits in the layer for nevents
+ System.out.println("avg total nhits="+layer.getAverageTotalNHits(nevents));
h1d("Layer: Average Total # Hits").fill(i, layer.getAverageTotalNHits(nevents));
}
}
SlicDiagnostics/src/org/lcsim/slic/diagnostics/util
diff -u -r1.4 -r1.5
--- UserOptions.java 24 Jan 2007 01:14:29 -0000 1.4
+++ UserOptions.java 16 May 2007 00:48:25 -0000 1.5
@@ -13,7 +13,7 @@
* Represents simple options set from properties file or command-line.
*
* @author Jeremy McCormick
- * @version $Id: UserOptions.java,v 1.4 2007/01/24 01:14:29 jeremy Exp $
+ * @version $Id: UserOptions.java,v 1.5 2007/05/16 00:48:25 jeremy Exp $
*/
public final class UserOptions
{
@@ -111,7 +111,7 @@
parseIntegerOption("config.eventNoticeInterval",1);
parseIntegerOption("config.verbosity",4);
parseIntegerOption("config.maxEvents",-1);
- parseStringOption("config.outputFile","SlicDiagnosticsPlots");
+ parseStringOption("config.outputFile","SlicDiagnosticsPlots.aida");
parseBooleanOption("config.convertClouds",false);
}
@@ -185,4 +185,4 @@
throw new RuntimeException(e);
}
}
-}
\ No newline at end of file
+}