SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.4 -r1.5
--- CalorimeterHitPlots.java	1 Aug 2005 06:33:50 -0000	1.4
+++ CalorimeterHitPlots.java	17 Aug 2005 03:43:49 -0000	1.5
@@ -49,9 +49,9 @@

     {
         super.definePlots();
 

-        mcpCountPerHit = aida.cloud1D(getName() + "_mcpPerHit");
-        mcpPDG = aida.cloud1D(getName() + "_mcpPDGID");
-        mcpSingleContribPDG = aida.cloud1D(getName() + "_mcpSingleContribPDGID");

+        mcpCountPerHit = aida.cloud1D(makePlotName("MCParticles per Hit"));
+        mcpPDG = aida.cloud1D(makePlotName("MCParticle PDGID"));
+        mcpSingleContribPDG = aida.cloud1D(makePlotName("MCParticle Single Contribution PDGID"));

     }
     
     public void fill()

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.3 -r1.4
--- EventSummaryPlots.java	4 Aug 2005 01:39:50 -0000	1.3
+++ EventSummaryPlots.java	17 Aug 2005 03:43:49 -0000	1.4
@@ -54,12 +54,12 @@

     {
         super.definePlots();
 

-        eventTotalEnergy = aida.cloud1D("event_energy");
-        eventHits = aida.cloud1D("event_hits");
-        eventTrackerHits = aida.cloud1D("event_trackerHits");
-        eventCalorimeterHits = aida.cloud1D("event_calorimeterHits");
-        eventTrackerEnergy = aida.cloud1D("event_trackerEnergy");
-        eventCalorimeterEnergy = aida.cloud1D("event_calorimeterEnergy");

+        eventTotalEnergy = aida.cloud1D(makePlotName("Energy"));
+        eventHits = aida.cloud1D(makePlotName("Hit Count"));
+        eventTrackerHits = aida.cloud1D(makePlotName("Tracker Hit Count"));
+        eventCalorimeterHits = aida.cloud1D(makePlotName("Calorimeter Hit Count"));
+        eventTrackerEnergy = aida.cloud1D(makePlotName("Tracker Total Energy"));
+        eventCalorimeterEnergy = aida.cloud1D(makePlotName("Calorimeter Total Energy"));

     }
     
     public void fill()

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.6 -r1.7
--- GenericHitPlots.java	1 Aug 2005 06:33:51 -0000	1.6
+++ GenericHitPlots.java	17 Aug 2005 03:43:49 -0000	1.7
@@ -16,7 +16,7 @@

     /* plots */
     ICloud1D energy;
     ICloud1D energyEvent;

-    ICloud1D time;

+    IHistogram1D time;

     ICloud2D thetaPhi;
     ICloud2D xy;
     ICloud2D rz;

@@ -47,16 +47,16 @@

     public void definePlots()
     {
         super.definePlots();

-        
-        energy = aida.cloud1D(getName() + "_hitEnergy");
-        hitAvgEnergy = aida.cloud1D(getName() + "_hitAvgEnergy");
-        time = aida.cloud1D(getName() + "_hitTime");
-        thetaPhi = aida.cloud2D(getName() + "_hitThetaPhi");
-        xy = aida.cloud2D(getName() + "_hitXY");
-        rz = aida.cloud2D(getName() + "_hitRZ");
-        layer = aida.histogram1D(getName() + "_hitLayer", nlayers, 0, nlayers);
-        energyEvent = aida.cloud1D(getName() + "_eventEnergy");
-        hitCount = aida.cloud1D(getName() + "_eventNumHits");

+
+        energy = aida.cloud1D(makePlotName("Hit Energy"));
+        hitAvgEnergy = aida.cloud1D(makePlotName("Hit Average Energy"));
+        time = aida.histogram1D(makePlotName("Hit Time"), 60, 0, 20);
+        thetaPhi = aida.cloud2D(makePlotName("Hit Theta vs. Phi"));
+        xy = aida.cloud2D(makePlotName("Hit X vs. Y"));
+        rz = aida.cloud2D(makePlotName("Hit R vs. Z"));
+        layer = aida.histogram1D(makePlotName("Hit Layer"), nlayers, 0, nlayers);
+        energyEvent = aida.cloud1D(makePlotName("Event Energy"));
+        hitCount = aida.cloud1D(makePlotName("Event Number of Hits"));

     }
     
     public void setGenericHitList(List<GenericHit> hits)

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.5 -r1.6
--- MCParticlePlots.java	5 Aug 2005 23:31:26 -0000	1.5
+++ MCParticlePlots.java	17 Aug 2005 03:43:49 -0000	1.6
@@ -68,12 +68,12 @@

     {
         super.definePlots();
         

-        mcpCount = aida.cloud1D("mcp_countByEvent");
-        mcpTotalEnergyFinalState = aida.cloud1D("mcp_finalStateEnergyTotalByEvent");
-        mcpSimStatus = aida.histogram1D("mcp_simStatusCode", 7, 1.0, 8.0);
-        mcpGenStatus = aida.histogram1D("mcp_generatorStatusCode", 4, 0.0, 4.0);
-        mcpCosTheta = aida.cloud1D("mcp_momentumCosTheta");
-        mcpPhi = aida.cloud1D("mcp_momentumPhi");

+        mcpCount = aida.cloud1D(makePlotName("Particle Count By Event"));
+        mcpTotalEnergyFinalState = aida.cloud1D(makePlotName("Final State Energy Total by Event"));
+        mcpSimStatus = aida.histogram1D(makePlotName("Simulator Status Code"), 7, 1.0, 8.0);
+        mcpGenStatus = aida.histogram1D(makePlotName("Generator Status Code"), 4, 0.0, 4.0);
+        mcpCosTheta = aida.cloud1D(makePlotName("Momentum CosTheta"));
+        mcpPhi = aida.cloud1D(makePlotName("Momentum Phi"));

     }
     
     public void fill()

@@ -124,16 +124,16 @@

                     if ( !particleName.equals("") && particleName != null)
                     {
                         /* particle energy */

-                        aida.cloud1D(particleName + "_energy").fill(particle.getEnergy());

+                        aida.cloud1D(particleName + ": Energy").fill(particle.getEnergy());

                         
                         /* particle momentum -> theta, phi */

-                        aida.cloud2D(particleName + "_momentumThetaPhi").fill(

+                        aida.cloud2D(particleName + ": Momentum Theta vs. Phi").fill(

                                 HitUtil.getTheta(particle.getMomentum().v()),
                                 HitUtil.getPhi(particle.getMomentum().v())
                                 );
                         
                         /* particle cosTheta */

-                        aida.cloud1D(particleName + "_momentumCosTheta").fill(

+                        aida.cloud1D(particleName + ": Momentum CosTheta").fill(

                                 VecOp.cosTheta(particle.getMomentum()));
                         
                         /* keep track of particle counts */

@@ -157,7 +157,7 @@

             for ( String k : particleCounts.keySet() )
             {
                 tree.cd(k);

-                aida.cloud1D(k + "_countByEvent").fill(particleCounts.get(k));

+                aida.cloud1D(k + ": Particle Count by Event").fill(particleCounts.get(k));

                 tree.cd("..");
             }
             

@@ -207,4 +207,4 @@

             mcpSimStatus.fill(STOPPED);
         }         
     }

-}

+}

\ No newline at end of file

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.2 -r1.3
--- PlotsBase.java	1 Aug 2005 06:33:51 -0000	1.2
+++ PlotsBase.java	17 Aug 2005 03:43:49 -0000	1.3
@@ -52,6 +52,11 @@

         cd();
     }
     

+    public String makePlotName(String plotName)
+    {
+        return getName() + ": " + plotName;
+    }
+    

     protected void setupAidaDir()
     {
         setupAidaDir(name);