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

diff -u -r1.2 -r1.3
--- SinglePhotonAnalysis.java	17 Jun 2010 17:33:07 -0000	1.2
+++ SinglePhotonAnalysis.java	17 Jun 2010 18:06:10 -0000	1.3
@@ -31,7 +31,7 @@

  *
  * @author Norman A. Graf
  *

- * @version $Id: SinglePhotonAnalysis.java,v 1.2 2010/06/17 17:33:07 ngraf Exp $

+ * @version $Id: SinglePhotonAnalysis.java,v 1.3 2010/06/17 18:06:10 ngraf Exp $

  */
 public class SinglePhotonAnalysis extends Driver
 {

@@ -43,6 +43,7 @@

     private String _fileType = "png";
     private boolean _writeOutAidaFile = false;
     private String _defaultAidaFileName = "test.aida";

+    private String _detectorName;

 
     public SinglePhotonAnalysis()
     {

@@ -50,6 +51,9 @@

 
     protected void process(EventHeader event)
     {

+         _detectorName = event.getDetectorName();
+        _tree.mkdirs(_detectorName);
+        _tree.cd(_detectorName);

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

@@ -115,7 +119,7 @@

         boolean doit = true;
         if (doit)
         {

-

+            _tree.cd(_detectorName);

             String[] pars =
             {
                 "amplitude", "mean", "sigma"

@@ -125,19 +129,19 @@

             String[] dirs = _tree.listObjectNames(".");
             for (int ii = 0; ii < dirs.length; ++ii)
             {

-//            System.out.println("dirs["+i+"]= "+dirs[i]);

+//                System.out.println("dirs[" + ii + "]= " + dirs[ii]);

                 String[] parts = dirs[ii].split("/");

-//            for(int k=0; k<parts.length; ++k)
-//            {
-//                System.out.println("parts["+k+"]= "+parts[k]);
-//            }

+//                for (int k = 0; k < parts.length; ++k)
+//                {
+//                    System.out.println("parts[" + k + "]= " + parts[k]);
+//                }

                 _tree.cd(dirs[ii]);
                 String[] objects = _tree.listObjectNames(".");
 

-//            for(int j=0; j<objects.length;++j)
-//            {
-//                System.out.println("obj["+j+"]= "+objects[i]);
-//            }

+//                for (int j = 0; j < objects.length; ++j)
+//                {
+//                    System.out.println("obj[" + j + "]= " + objects[j]);
+//                }

 
                 sortDirectoriesByEnergy(objects);
 

@@ -195,7 +199,7 @@

                         {
                             int nbins = 50;
 //                            System.out.println(energies[i] + " - " + lowE + " + " + hiE);

-                            e.convert(50, lowE, hiE);

+                            e.convert(nbins, lowE, hiE);

                         }
                         IHistogram1D eHist = e.histogram();
                         gauss.setParameter("amplitude", eHist.maxBinHeight());