SlicDiagnostics

diff -u -r1.3 -r1.4
--- project.properties	9 Sep 2005 18:08:53 -0000	1.3
+++ project.properties	1 Feb 2006 23:40:27 -0000	1.4
@@ -2,10 +2,10 @@

 maven.jar.mainclass=org.lcsim.slic.diagnostics.Main
 
 # remove repository

-maven.repo.remote = http://www.ibiblio.org/maven,http://java.freehep.org/maven

+maven.repo.remote = http://www.ibiblio.org/maven,http://java.freehep.org/maven,http://www.lcsim.org/maven

 
 # JavaDoc links

-maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/, http://java.freehep.org/lib/freehep/api/

+maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/,http://java.freehep.org/lib/freehep/api/

 
 # skip tests?
 maven.test.skip = false

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.20 -r1.21
--- CalorimeterHitPlots.java	1 Feb 2006 01:35:08 -0000	1.20
+++ CalorimeterHitPlots.java	1 Feb 2006 23:40:28 -0000	1.21
@@ -24,7 +24,7 @@

 
 /**
  * @author jeremym

- * @version $Id: CalorimeterHitPlots.java,v 1.20 2006/02/01 01:35:08 jeremy Exp $

+ * @version $Id: CalorimeterHitPlots.java,v 1.21 2006/02/01 23:40:28 jeremy Exp $

  */
 class CalorimeterHitPlots extends AbstractPlots
 {

@@ -116,15 +116,15 @@

     protected void definePlots()
     {
         cd();

-        _mcpCountPerHit          = _aida.cloud1D("MCParticles: # per Hit");
-        _mcpPDG                  = _aida.cloud1D("MCParticles: PDGID");
-        _mcpSingleContribPDG     = _aida.cloud1D("MCParticles: Single Contribution PDGID");

+        _mcpCountPerHit          = _aida.cloud1D("MCParticle: # per Hit");
+        _mcpPDG                  = _aida.cloud1D("MCParticle: PDGID");
+        _mcpSingleContribPDG     = _aida.cloud1D("MCParticle: Single Contribution PDGID");

         _hitCorrectedEnergy      = _aida.cloud1D("Hit: Corrected Energy");
         _hitRawVsCorrectedEnergy = _aida.cloud2D("Hit: Raw vs Corrected Energy");

-        _mcpMissing              = _aida.cloud1D("MCParticles: Contribution Missing");
-        _mcpCluster              = _aida.cloud2D("Clusters: Particle Kinetic Energy vs CheatCluster Energy");

+        _mcpMissing              = _aida.cloud1D("MCParticle: Contribution Missing");
+        _mcpCluster              = _aida.cloud2D("Cluster: Particle Kinetic Energy vs CheatCluster Energy");

         _clusterHitCount         = _aida.cloud1D("Hit: Count in a Single Cluster");

-        _clusterHitMaxE          = _aida.cloud1D("Clusters: Max Cell Energy in a Cluster Divided by Total Cluster Energy");

+        _clusterHitMaxE          = _aida.cloud1D("Cluster: Max Cell Energy in a Cluster Divided by Total Cluster Energy");

     }
     
     protected void fill(EventHeader event)

@@ -249,17 +249,17 @@

         public void fill(CalorimeterIDDecoder segmentation)
         {
             cd();

-            _aida.cloud2D("Phi vs Phi Bin").fill(

+            _aida.cloud2D("Hit: Phi vs Phi Bin").fill(

                     segmentation.getPhi(),
                     (double)segmentation.getValue("phi")
                     );
             

-            _aida.cloud2D("Theta vs Theta Bin").fill(

+            _aida.cloud2D("Hit: Theta vs Theta Bin").fill(

                     segmentation.getTheta(),
                     (double)segmentation.getValue("theta")
                     );
             

-            _aida.cloud2D("Phi Bin vs Theta Bin").fill(

+            _aida.cloud2D("Hit: Phi Bin vs Theta Bin").fill(

                     (double)segmentation.getValue("phi"),
                     (double)segmentation.getValue("theta")
                     );

@@ -276,17 +276,17 @@

         public void fill(CalorimeterIDDecoder segmentation)
         {
             

-            _aida.cloud2D("Phi vs Phi Bin").fill(

+            _aida.cloud2D("Hit: Phi vs Phi Bin").fill(

                     segmentation.getPhi(),
                     (double)segmentation.getValue("phi")
                     );
             

-            _aida.cloud2D("Z vs Z Bin").fill(

+            _aida.cloud2D("Hit: Z vs Z Bin").fill(

                     segmentation.getZ(),
                     (double)segmentation.getValue("z")
                     );
             

-            _aida.cloud2D("Phi Bin vs Z Bin").fill(

+            _aida.cloud2D("Hit: Phi Bin vs Z Bin").fill(

                     (double)segmentation.getValue("phi"),
                     (double)segmentation.getValue("z")
                     );

@@ -302,17 +302,17 @@

         
         public void fill(CalorimeterIDDecoder segmentation)
         {

-            _aida.cloud2D("X vs X Bin").fill(

+            _aida.cloud2D("Hit: X vs X Bin").fill(

                     segmentation.getX(),
                     (double)segmentation.getValue("x")
                     );
             

-            _aida.cloud2D("Y vs Y Bin").fill(

+            _aida.cloud2D("Hit: Y vs Y Bin").fill(

                     segmentation.getZ(),
                     (double)segmentation.getValue("y")
                     );
             

-            _aida.cloud2D("X Bin vs Y Bin").fill(

+            _aida.cloud2D("Hit: X Bin vs Y Bin").fill(

                     (double)segmentation.getValue("x"),
                     (double)segmentation.getValue("y")
                     );

@@ -328,17 +328,17 @@

         
         public void fill(CalorimeterIDDecoder segmentation)
         {

-            _aida.cloud2D("X vs X Bin").fill(

+            _aida.cloud2D("Hit: X vs X Bin").fill(

                     segmentation.getX(),
                     (double)segmentation.getValue("x")
                     );
             

-            _aida.cloud2D("Z vs Z Bin").fill(

+            _aida.cloud2D("Hit: Z vs Z Bin").fill(

                     segmentation.getZ(),
                     (double)segmentation.getValue("z")
                     );
             

-            _aida.cloud2D("X Bin vs Z Bin").fill(

+            _aida.cloud2D("Hit: X Bin vs Z Bin").fill(

                     (double)segmentation.getValue("x"),
                     (double)segmentation.getValue("z")
                     );

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.19 -r1.20
--- GenericHitPlots.java	1 Feb 2006 01:35:09 -0000	1.19
+++ GenericHitPlots.java	1 Feb 2006 23:40:28 -0000	1.20
@@ -9,6 +9,8 @@

 import java.util.List;
 import java.util.Map;
 

+import static java.lang.Math.log10;
+

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;
 import org.lcsim.geometry.Layered;

@@ -17,7 +19,7 @@

 
 /**
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.19 2006/02/01 01:35:09 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.20 2006/02/01 23:40:28 jeremy Exp $

  */
 class GenericHitPlots extends AbstractPlots
 {

@@ -34,7 +36,8 @@

 	IHistogram1D _layer;	
 	ICloud1D _hitCount;
 	

-	IHistogram1D _time;

+//	IHistogram1D _time;
+	ICloud1D _time;

 	ICloud1D _timeAvg;
 	ICloud2D _timeVsSphR;
 	ICloud2D _thetaPhi;

@@ -92,7 +95,8 @@

 		if ( meta.getType().getSimpleName().compareTo("SimCalorimeterHit") == 0 )
 		{
 			dir = "CalorimeterHits";

-		} else

+		} 
+		else

 		{
 			dir = "TrackerHits";
 		}

@@ -131,9 +135,10 @@

 
 		_energy = _aida.cloud1D("Hit: Energy");
 		_hitAvgEnergy = _aida.cloud1D("Hit: Average Energy by Event");

-		_time = _aida.histogram1D("Hit: Time", 100, 0, 50);
-		_timeAvg = _aida.cloud1D("Hit: Time Average");
-		_timeVsSphR = _aida.cloud2D("Hit: Time vs Spherical R");

+//		_time = _aida.histogram1D("Hit: Time", 100, 0, 50);
+		_time = _aida.cloud1D("Hit: Time (log10)");
+		_timeAvg = _aida.cloud1D("Hit: Time (log10) Average");
+		_timeVsSphR = _aida.cloud2D("Hit: Time (log10) vs Spherical R");

 		_thetaPhi = _aida.cloud2D("Hit: Theta vs Phi");
 		_xy = _aida.cloud2D("Hit: X vs Y");
 		_zx = _aida.cloud2D("Hit: Z vs X");

@@ -225,6 +230,7 @@

 			double z = hit.getZ();
 			double edep = hit.getEnergy();
 			double time = hit.getTime();

+			double timelog10 = log10(hit.getTime());

 			double theta = hit.getTheta();
 			double phi = hit.getPhi();
 			int layern = hit.getLayer();

@@ -235,10 +241,11 @@

 			_energy.fill(edep);
 
 			// hit time

-			_time.fill(time);

+			_time.fill(timelog10);

 
 			// time vs spherical R

-			_timeVsSphR.fill(time, sphR);

+//			_timeVsSphR.fill(time, sphR);
+			_timeVsSphR.fill(timelog10, sphR);

 
 			// hit theta vs. phi
 			_thetaPhi.fill(theta, phi);

@@ -351,7 +358,7 @@

 		_hitMaxEdepOverTot.fill(maxEdep / eventTotE);
 
 		// average time

-		_timeAvg.fill(totTime);

+		_timeAvg.fill(log10(totTime));

 
 		// event energy
 		_energyEvent.fill(eventTotE);