Print

Print


Commit in GeomConverter/src/org/lcsim/geometry on MAIN
Calorimeter.java+1-11.11 -> 1.12
CylindricalSubdetector.java+4-41.9 -> 1.10
Detector.java+1-11.28 -> 1.29
FieldMap.java+1-11.1 -> 1.2
Subdetector.java+12-101.10 -> 1.11
+19-17
5 modified files
JM: make interface functions explicitly public

GeomConverter/src/org/lcsim/geometry
Calorimeter.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- Calorimeter.java	7 Feb 2006 16:58:53 -0000	1.11
+++ Calorimeter.java	8 Feb 2006 01:01:38 -0000	1.12
@@ -7,5 +7,5 @@
  */
 public interface Calorimeter extends Subdetector
 {	   
-	CalorimeterType getCalorimeterType();
+	public CalorimeterType getCalorimeterType();
 }
\ No newline at end of file

GeomConverter/src/org/lcsim/geometry
CylindricalSubdetector.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- CylindricalSubdetector.java	28 Oct 2005 00:34:16 -0000	1.9
+++ CylindricalSubdetector.java	8 Feb 2006 01:01:38 -0000	1.10
@@ -9,8 +9,8 @@
  */
 public interface CylindricalSubdetector
 {
-   double getInnerRadius();
-   double getOuterRadius();
-   double getZMin();
-   double getZMax();   
+    public double getInnerRadius();
+    public double getOuterRadius();
+    public double getZMin();
+    public double getZMax();   
 }

GeomConverter/src/org/lcsim/geometry
Detector.java 1.28 -> 1.29
diff -u -r1.28 -r1.29
--- Detector.java	7 Feb 2006 17:02:28 -0000	1.28
+++ Detector.java	8 Feb 2006 01:01:38 -0000	1.29
@@ -48,7 +48,7 @@
     {
         super.addSubdetector(sub);
         setupIDDecoder(sub);
-        // System.out.println("Added subdet: " + sub.getName() );
+        System.out.println("Added subdet: " + sub.getName() );
     }
 
     /* setup subdetector backlink in the IDDecoder */

GeomConverter/src/org/lcsim/geometry
FieldMap.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- FieldMap.java	10 Mar 2005 05:10:05 -0000	1.1
+++ FieldMap.java	8 Feb 2006 01:01:38 -0000	1.2
@@ -7,5 +7,5 @@
 public interface FieldMap
 {
    // Get the field magnitude and direction at a particular point.
-   double[] getField(double[] position);
+    public double[] getField(double[] position);
 }

GeomConverter/src/org/lcsim/geometry
Subdetector.java 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- Subdetector.java	17 Jan 2006 18:42:39 -0000	1.10
+++ Subdetector.java	8 Feb 2006 01:01:38 -0000	1.11
@@ -9,15 +9,17 @@
  */
 public interface Subdetector 
 {
-    String getName();
-    IDDecoder getIDDecoder();
-    Layering getLayering();
-    ParameterSet getParameters();
-        
-    boolean isTracker();
-    boolean isCalorimeter();
-    boolean isBarrel();
-    boolean isEndcap();
+    public String getName();
+    public int getSystemID();
     
-    double[] transformLocalToGlobal(double[] localPos);
+    public IDDecoder getIDDecoder();
+    public Layering getLayering();
+    public ParameterSet getParameters();
+           
+    public boolean isTracker();
+    public boolean isCalorimeter();
+    public boolean isBarrel();
+    public boolean isEndcap();
+    
+    public double[] transformLocalToGlobal(double[] localPos);
 }
CVSspam 0.2.8