Commit in lcsim/src/org/lcsim/recon/cluster/directedtree on MAIN
RunControlParameters.java+156-1561.5 -> 1.6
JM: comment out unused parameters

lcsim/src/org/lcsim/recon/cluster/directedtree
RunControlParameters.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- RunControlParameters.java	21 Jun 2006 18:03:32 -0000	1.5
+++ RunControlParameters.java	25 Jun 2008 22:00:37 -0000	1.6
@@ -4,33 +4,33 @@
 
     // default constructor
     RunControlParameters() {
-	this.defaultValues();
+        this.defaultValues();
     }
 
     void setSteeringFile(String f) {
-	System.out.println("Updating parameters from steering file: "+f+".");
-	this.updateFromSteeringFile( f );
+        System.out.println("Updating parameters from steering file: "+f+".");
+        this.updateFromSteeringFile( f );
     }
 
     void defaultValues() {
-	_minHits= 0;
+        _minHits= 0;
 
-	// sidaug05_tcmt (and SDNPHOct04 certification)
+        // sidaug05_tcmt (and SDNPHOct04 certification)
         _EMsampWt = 1.0/0.012366;
         _HDsampWt = 1.0/0.03136;
         _EMmip = 0.007439754;  // in GeV (corrected energy)
         _HDmip = 0.026147959;  // in GeV (corrected energy)
 
-// 	// SDNPHOct04 (as taken from Vishnu)
-//         _EMsampWt = 1.0/0.022;
-//         _HDsampWt = 1.0/0.03;
-//         _EMmip = 0.008;  // in GeV (corrected energy)
-//         _HDmip = 0.031;  // in GeV (corrected energy)
+//      // SDNPHOct04 (as taken from Vishnu)
+//      _EMsampWt = 1.0/0.022;
+//      _HDsampWt = 1.0/0.03;
+//      _EMmip = 0.008;  // in GeV (corrected energy)
+//      _HDmip = 0.031;  // in GeV (corrected energy)
 
         _EMthresh = 0.25; // was 0.25
         _HDthresh = 0.25; // was 0.25
 
-	// density neighborhood
+        // density neighborhood
         _lyrNeighEM = 8; // was 8 ???
         _zNeighEM = 4; // was 4 ???
         _phiNeighEM = 4; // was 4 ???
@@ -38,168 +38,168 @@
         _zNeighHD = 4; // was 4 ???
         _phiNeighHD = 4; // was 4 ???
 
-	_minimumDensity = 1;
-	_maximumDensity = 100000;
+        _minimumDensity = 1;
+        _maximumDensity = 100000;
 
-	_lyrContractionEM = new int[3];
-	_lyrContractionEM[0] = 0;
-	_lyrContractionEM[1] = -7;
-	_lyrContractionEM[2] = -7;
-	_zContractionEM = new int[3];
-	_zContractionEM[0] = -4;
-	_zContractionEM[1] = 0;
-	_zContractionEM[2] = 2;
-	_phiContractionEM = new int[3];
-	_phiContractionEM[0] = -6;
-	_phiContractionEM[1] = 0;
-	_phiContractionEM[2] = 2;
-	_lyrContractionHD = new int[3];
-	_lyrContractionHD[0] = 0;
+        _lyrContractionEM = new int[3];
+        _lyrContractionEM[0] = 0;
+        _lyrContractionEM[1] = -7;
+        _lyrContractionEM[2] = -7;
+        _zContractionEM = new int[3];
+        _zContractionEM[0] = -4;
+        _zContractionEM[1] = 0;
+        _zContractionEM[2] = 2;
+        _phiContractionEM = new int[3];
+        _phiContractionEM[0] = -6;
+        _phiContractionEM[1] = 0;
+        _phiContractionEM[2] = 2;
+        _lyrContractionHD = new int[3];
+        _lyrContractionHD[0] = 0;
         _lyrContractionHD[1] = -7;
         _lyrContractionHD[2] = -7;
-	_zContractionHD = new int[3];
+        _zContractionHD = new int[3];
         _zContractionHD[0] = -4;
         _zContractionHD[1] = 0;
         _zContractionHD[2] = 2;
-	_phiContractionHD = new int[3];
+        _phiContractionHD = new int[3];
         _phiContractionHD[0] = -6;
         _phiContractionHD[1] = 0;
         _phiContractionHD[2] = 2;
         _distanceType = "Euclidean";
         _clusterSeparately = true;
         _centroidWeightType = "Density";
-        _ModeValleyFactors = new double[2][2];
-        _ModeValleyFactors[0][0] = 0.8;
-        _ModeValleyFactors[0][1] = 0.15;
-        _ModeValleyFactors[1][0] = 0.025;
-        _ModeValleyFactors[1][1] = 0.025;
-        _convergenceParameter = 0.001;
-	_prune = true;
-	_pruningDist = 500.;
-	_maxMaskSize = 20;
-	_emSigma = new double[3];
-	_emSigma[0] = 1.5;
-	_emSigma[1] = 1.5;
-	_emSigma[2] = 1.5;
+        //_ModeValleyFactors = new double[2][2];
+        //_ModeValleyFactors[0][0] = 0.8;
+        //_ModeValleyFactors[0][1] = 0.15;
+        //_ModeValleyFactors[1][0] = 0.025;
+        //_ModeValleyFactors[1][1] = 0.025;
+        //_convergenceParameter = 0.001;
+        //_prune = true;
+        //_pruningDist = 500.;
+        //_maxMaskSize = 20;
+        //_emSigma = new double[3];
+        //_emSigma[0] = 1.5;
+        //_emSigma[1] = 1.5;
+        //_emSigma[2] = 1.5;
     }
 
     private void updateFromSteeringFile(String file) {
-	// Pull window parameters from steering file
+        // Pull window parameters from steering file
         if(file != null) {
-	    try {
-		ConfigReader reader = new ConfigReader(file);
+            try {
+                ConfigReader reader = new ConfigReader(file);
 
-		String temp;
+                String temp;
 
-		// ECAL Neighborhood Window
-		temp  = reader.getTokenWithPattern(2,"lyrNeighEM");
-		_lyrNeighEM = Integer.parseInt(temp);
+                // ECAL Neighborhood Window
+                temp  = reader.getTokenWithPattern(2,"lyrNeighEM");
+                _lyrNeighEM = Integer.parseInt(temp);
 
-		temp  = reader.getTokenWithPattern(2,"zNeighEM");
-		_zNeighEM = Integer.parseInt(temp);
+                temp  = reader.getTokenWithPattern(2,"zNeighEM");
+                _zNeighEM = Integer.parseInt(temp);
 
-		temp  = reader.getTokenWithPattern(2,"phiNeighEM");
-		_phiNeighEM = Integer.parseInt(temp);
+                temp  = reader.getTokenWithPattern(2,"phiNeighEM");
+                _phiNeighEM = Integer.parseInt(temp);
 
-		// layer contraction EM
-		_lyrContractionEM = new int[3];
-		temp = reader.getTokenWithPattern(2,"lyrContractionEM[0]");
-		_lyrContractionEM[0] = Integer.parseInt(temp);
+                // layer contraction EM
+                _lyrContractionEM = new int[3];
+                temp = reader.getTokenWithPattern(2,"lyrContractionEM[0]");
+                _lyrContractionEM[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"lyrContractionEM[1]");
-		_lyrContractionEM[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"lyrContractionEM[1]");
+                _lyrContractionEM[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"lyrContractionEM[2]");
-		_lyrContractionEM[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"lyrContractionEM[2]");
+                _lyrContractionEM[2] = Integer.parseInt(temp);
 
-		// z contraction EM
-		_zContractionEM = new int[3];
-		temp = reader.getTokenWithPattern(2,"zContractionEM[0]");
-		_zContractionEM[0] = Integer.parseInt(temp);
+                // z contraction EM
+                _zContractionEM = new int[3];
+                temp = reader.getTokenWithPattern(2,"zContractionEM[0]");
+                _zContractionEM[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"zContractionEM[1]");
-		_zContractionEM[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"zContractionEM[1]");
+                _zContractionEM[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"zContractionEM[2]");
-		_zContractionEM[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"zContractionEM[2]");
+                _zContractionEM[2] = Integer.parseInt(temp);
 
-		// phi contraction EM
-		_phiContractionEM = new int[3];
-		temp = reader.getTokenWithPattern(2,"phiContractionEM[0]");
-		_phiContractionEM[0] = Integer.parseInt(temp);
+                // phi contraction EM
+                _phiContractionEM = new int[3];
+                temp = reader.getTokenWithPattern(2,"phiContractionEM[0]");
+                _phiContractionEM[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"phiContractionEM[1]");
-		_phiContractionEM[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"phiContractionEM[1]");
+                _phiContractionEM[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"phiContractionEM[2]");
-		_phiContractionEM[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"phiContractionEM[2]");
+                _phiContractionEM[2] = Integer.parseInt(temp);
 
-		// HCAL Neighborhood Window
-		temp  = reader.getTokenWithPattern(2,"lyrNeighHD");
-		_lyrNeighHD = Integer.parseInt(temp);
+                // HCAL Neighborhood Window
+                temp  = reader.getTokenWithPattern(2,"lyrNeighHD");
+                _lyrNeighHD = Integer.parseInt(temp);
 
-		temp  = reader.getTokenWithPattern(2,"zNeighHD");
-		_zNeighHD = Integer.parseInt(temp);
+                temp  = reader.getTokenWithPattern(2,"zNeighHD");
+                _zNeighHD = Integer.parseInt(temp);
 
-		temp  = reader.getTokenWithPattern(2,"phiNeighHD");
-		_phiNeighHD = Integer.parseInt(temp);
+                temp  = reader.getTokenWithPattern(2,"phiNeighHD");
+                _phiNeighHD = Integer.parseInt(temp);
 
-		// layer contraction HD
-		_lyrContractionHD = new int[3];
-		temp = reader.getTokenWithPattern(2,"lyrContractionHD[0]");
-		_lyrContractionHD[0] = Integer.parseInt(temp);
+                // layer contraction HD
+                _lyrContractionHD = new int[3];
+                temp = reader.getTokenWithPattern(2,"lyrContractionHD[0]");
+                _lyrContractionHD[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"lyrContractionHD[1]");
-		_lyrContractionHD[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"lyrContractionHD[1]");
+                _lyrContractionHD[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"lyrContractionHD[2]");
-		_lyrContractionHD[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"lyrContractionHD[2]");
+                _lyrContractionHD[2] = Integer.parseInt(temp);
 
-		// z contraction HD
-		_zContractionHD = new int[3];
-		temp = reader.getTokenWithPattern(2,"zContractionHD[0]");
-		_zContractionHD[0] = Integer.parseInt(temp);
+                // z contraction HD
+                _zContractionHD = new int[3];
+                temp = reader.getTokenWithPattern(2,"zContractionHD[0]");
+                _zContractionHD[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"zContractionHD[1]");
-		_zContractionHD[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"zContractionHD[1]");
+                _zContractionHD[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"zContractionHD[2]");
-		_zContractionHD[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"zContractionHD[2]");
+                _zContractionHD[2] = Integer.parseInt(temp);
 
-		// phi contraction HD
-		_phiContractionHD = new int[3];
-		temp = reader.getTokenWithPattern(2,"phiContractionHD[0]");
-		_phiContractionHD[0] = Integer.parseInt(temp);
+                // phi contraction HD
+                _phiContractionHD = new int[3];
+                temp = reader.getTokenWithPattern(2,"phiContractionHD[0]");
+                _phiContractionHD[0] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"phiContractionHD[1]");
-		_phiContractionHD[1] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"phiContractionHD[1]");
+                _phiContractionHD[1] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"phiContractionHD[2]");
-		_phiContractionHD[2] = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"phiContractionHD[2]");
+                _phiContractionHD[2] = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"minimumDensity");
-		_minimumDensity = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"minimumDensity");
+                _minimumDensity = Integer.parseInt(temp);
 
-		temp = reader.getTokenWithPattern(2,"maximumDensity");
-		_maximumDensity = Integer.parseInt(temp);
+                temp = reader.getTokenWithPattern(2,"maximumDensity");
+                _maximumDensity = Integer.parseInt(temp);
 
-		reader.close();
-	    }
-	    catch (Exception x) {
+                reader.close();
+            }
+            catch (Exception x) {
                 System.out.println("Error reading steering file: "+x);
                 System.exit(1);
-	    }
+            }
 
         } // if != null
         else {
-                System.out.println("Error reading steering file.");
+            System.out.println("Error reading steering file.");
         }
-	// End pull window parameters from steering file
+        // End pull window parameters from steering file
     }
 
     private int _minHits;
     public int getMinimumSize(){
-	return this._minHits;
+        return this._minHits;
     }
 
     private double _EMsampWt;
@@ -277,73 +277,73 @@
         return this._clusterSeparately;
     }
 
-    private double[][] _ModeValleyFactors;
-    public double[][] getInfluenceFactors(){
-        return this._ModeValleyFactors;
-    }
-
-    private double _convergenceParameter;
-    public double getConvergenceParameter(){
-        return this._convergenceParameter;
-    }
-
-    private boolean _prune;
-    public boolean Prune(){
-	return this._prune;
-    }
-
-    private double _pruningDist;
-    public double getPruningDist(){
-	return this._pruningDist;
-    }
-
-    private int _maxMaskSize;
-    public int getMaxMaskSize(){
-	return this._maxMaskSize;
-    }
-
-    private double[] _emSigma;
-    public double[] getEMGaussWidths(){
-	return this._emSigma;
-    }
+    //private double[][] _ModeValleyFactors;
+    //public double[][] getInfluenceFactors(){
+    //    return this._ModeValleyFactors;
+    //}
+
+    //private double _convergenceParameter;
+    //public double getConvergenceParameter(){
+    //    return this._convergenceParameter;
+    //}
+
+    //private boolean _prune;
+    //public boolean Prune(){
+    //    return this._prune;
+    //}
+
+    //private double _pruningDist;
+    //public double getPruningDist(){
+    //    return this._pruningDist;
+    //}
+
+    //private int _maxMaskSize;
+    //public int getMaxMaskSize(){
+    //    return this._maxMaskSize;
+    //}
+
+    //private double[] _emSigma;
+    //public double[] getEMGaussWidths(){
+    //    return this._emSigma;
+    //}
 
     private int[] _lyrContractionEM;
     public int[] getLyrContracEM(){
-	return this._lyrContractionEM;
+        return this._lyrContractionEM;
     }
 
     private int[] _zContractionEM;
     public int[] getZContracEM(){
-	return this._zContractionEM;
+        return this._zContractionEM;
     }
 
     private int[] _phiContractionEM;
     public int[] getPhiContracEM(){
-	return this._phiContractionEM;
+        return this._phiContractionEM;
     }
 
     private int[] _lyrContractionHD;
     public int[] getLyrContracHD(){
-	return this._lyrContractionHD;
+        return this._lyrContractionHD;
     }
 
     private int[] _zContractionHD;
     public int[] getZContracHD(){
-	return this._zContractionHD;
+        return this._zContractionHD;
     }
 
     private int[] _phiContractionHD;
     public int[] getPhiContracHD(){
-	return this._phiContractionHD;
+        return this._phiContractionHD;
     }
 
     private int _minimumDensity;
     public int getMinimumDensity(){
-	return this._minimumDensity;
+        return this._minimumDensity;
     }
 
     private int _maximumDensity;
     public int getMaximumDensity(){
-	return this._maximumDensity;
+        return this._maximumDensity;
     }
 }
CVSspam 0.2.8