lcsim-cal-calib/src/org/lcsim/cal/calib

diff -u -r1.1 -r1.2
--- EMClusterID.java	5 Jun 2008 05:27:03 -0000	1.1
+++ EMClusterID.java	5 Jun 2008 05:36:18 -0000	1.2
@@ -42,7 +42,7 @@

     
     private HMatrixBuilder _hmb;
     private HMatrix _hmx;

-   

+    

     // the number of variables in the measurement vector
     private int _nmeas;
     

@@ -53,7 +53,7 @@

     double[] _layerMapping;
     
     private DecimalFormat _myFormatter = new DecimalFormat("#.###");

-  

+    

     private boolean _debug = true;
     
     // where to write the HMatrix if in accumulate mode

@@ -107,13 +107,15 @@

                 System.out.println("detector name from HMatrix.properties: "+detectorNameFromFile +" detector name from event "+event.getDetectorName());
                 throw new RuntimeException("detector name mismatch in HMatrix!");
             }

-            // add the detector name to the output file
-            _fileLocation = event.getDetectorName()+"_"+_fileLocation;

             // the vector of measurements starts as the longitudinal layers
             _nmeas = _cond.getInt("measurementDimension");
             // would add any additional measurements (e.g. width) here
             _vals = new double[_nmeas];
             

+            // add the detector name and measurement dimensionality to the output file
+            _fileLocation = event.getDetectorName()+"_"+_fileLocation+"_"+_nmeas+".hmx";
+            
+            

             _layerMapping = _cond.getDoubleArray(_nmeas+"layerMapping");
 //            for (int i=0; i<_layerMapping.length; ++i)
 //            {

@@ -128,7 +130,7 @@

                 System.out.println("found "+_nLayers+" layers in the "+det[0]);
                 throw new RuntimeException("layer number mismatch in EMCalorimeter!");
             }

-                  

+            

             //FIXME key needs to be better defined
             int key = 0;
             if(_task==HMatrixTask.ANALYZE)

@@ -142,10 +144,10 @@

             }
             _detName = event.getDetectorName();
             

-

+            

             _initialized = true;
         }

-

+        

         List<Cluster> photons = new ArrayList<Cluster>();
         for(int j=0; j<det.length; ++j)
         {

lcsim-cal-calib/src/org/lcsim/cal/calib

diff -u -r1.1 -r1.2
--- StandaloneEMClusterAnalysis.java	5 Jun 2008 05:27:03 -0000	1.1
+++ StandaloneEMClusterAnalysis.java	5 Jun 2008 05:36:18 -0000	1.2
@@ -45,7 +45,7 @@

                 if(s.startsWith("Theta")) HMatrixName+=s+"_";
                 if(s.contains("GeV")) HMatrixName+=s;
             }

-            HMatrixName+=".hmx";

+//            HMatrixName+=".hmx";

         
             LCSimLoop loop = new LCSimLoop();
             loop.setLCIORecordSource(f);