lcsim-analysis/src/main/java/org/lcsim/analysis

diff -u -r1.7 -r1.8
--- SinglePhotonAnalysis.java	17 Jun 2010 20:31:03 -0000	1.7
+++ SinglePhotonAnalysis.java	17 Jun 2010 22:22:48 -0000	1.8
@@ -35,7 +35,7 @@

  *
  * @author Norman A. Graf
  *

- * @version $Id: SinglePhotonAnalysis.java,v 1.7 2010/06/17 20:31:03 ngraf Exp $

+ * @version $Id: SinglePhotonAnalysis.java,v 1.8 2010/06/17 22:22:48 ngraf Exp $

  */
 public class SinglePhotonAnalysis extends Driver
 {

@@ -48,6 +48,7 @@

     private boolean _writeOutAidaFile = false;
     private String _defaultAidaFileName = "test";
     private String _detectorName;

+    private String _particleType;

 
     public SinglePhotonAnalysis()
     {

@@ -61,7 +62,7 @@

         // organize the histogram tree by species and energy
         List<MCParticle> mcparts = event.getMCParticles();
         MCParticle mcpart = mcparts.get(mcparts.size() - 1);

-        String particleType = mcpart.getType().getName();

+        _particleType = mcpart.getType().getName();

         double mcEnergy = mcpart.getEnergy();
         long mcIntegerEnergy = Math.round(mcEnergy);
         boolean meV = false;

@@ -71,8 +72,8 @@

             meV = true;
         }
 

-        _tree.mkdirs(particleType);
-        _tree.cd(particleType);

+        _tree.mkdirs(_particleType);
+        _tree.cd(_particleType);

         _tree.mkdirs(mcIntegerEnergy + (meV ? "_MeV" : "_GeV"));
         _tree.cd(mcIntegerEnergy + (meV ? "_MeV" : "_GeV"));
 

@@ -98,7 +99,7 @@

     @Override
     protected void endOfData()
     {

-        String AidaFileName = _defaultAidaFileName + "_" + _detectorName + "_" + this.getClass().getSimpleName() + "_" + date() + ".aida";

+        String AidaFileName = _defaultAidaFileName + "_" + _detectorName + "_" + this._particleType+"_"+this.getClass().getSimpleName() + "_" + date() + ".aida";

 
         if (_writeOutAidaFile)
         {

@@ -218,6 +219,10 @@

                         style = plotter.region(i).style();
                         style.legendBoxStyle().setVisible(false);
                         style.statisticsBoxStyle().setVisible(false);

+                        //
+                        style.xAxisStyle().setLabel(_particleType+" "+energies[i]+" GeV");
+                        style.titleStyle().setVisible(false);
+                        //

                         double loElimit = lowE; //energies[i] - .6 * sqrt(energies[i]); // expect ~20% resolution, and go out 3 sigma
                         double hiElimit = hiE; //energies[i] + .6 * sqrt(energies[i]);
                         plotter.region(i).setXLimits(loElimit, hiElimit);

@@ -329,7 +334,8 @@

                     resolution.show();
                     resolution2.show();
                     residuals.show();

-                } else

+                }
+                else

                 {
                     try
                     {