GeomConverter/src/org/lcsim/geometry
diff -u -r1.14 -r1.15
--- Calorimeter.java 9 Dec 2009 01:23:44 -0000 1.14
+++ Calorimeter.java 18 Dec 2009 19:32:28 -0000 1.15
@@ -19,23 +19,43 @@
BEAM;
public static CalorimeterType fromString(final String s)
{
- if (s.equals("HAD_BARREL")) return HAD_BARREL;
- if (s.equals("HAD_ENDCAP")) return HAD_ENDCAP;
- else if (s.equals("EM_BARREL")) return EM_BARREL;
- else if (s.equals("EM_ENDCAP")) return EM_ENDCAP;
+ if (s.equals("HAD_BARREL")) return HAD_BARREL;
+ if (s.equals("HAD_ENDCAP")) return HAD_ENDCAP;
+ else if (s.equals("EM_BARREL")) return EM_BARREL;
+ else if (s.equals("EM_ENDCAP")) return EM_ENDCAP;
else if (s.equals("MUON_BARREL")) return MUON_BARREL;
else if (s.equals("MUON_ENDCAP")) return MUON_ENDCAP;
- else if (s.equals("LUMI")) return LUMI;
- else if (s.equals("BEAM")) return BEAM;
- else return UNKNOWN;
+ else if (s.equals("LUMI")) return LUMI;
+ else if (s.equals("BEAM")) return BEAM;
+ else return UNKNOWN;
+ }
+
+ public static String toString(CalorimeterType c)
+ {
+ if (c.equals(HAD_BARREL)) return "HAD_BARREL";
+ else if (c.equals(HAD_ENDCAP)) return "HAD_ENDCAP";
+ else if (c.equals(EM_BARREL)) return "EM_BARREL";
+ else if (c.equals(EM_ENDCAP)) return "EM_ENDCAP";
+ else if (c.equals(MUON_BARREL)) return "MUON_BARREL";
+ else if (c.equals(MUON_ENDCAP)) return "MUON_ENDCAP";
+ else if (c.equals(LUMI)) return "LUMI";
+ else if (c.equals(BEAM)) return "BEAM";
+ else return "UNKNOWN";
}
}
public CalorimeterType getCalorimeterType();
- // TODO: Implement these.
- // public double getInnerRadius();
- // public double getOuterRadius();
- // public double getOuterZ();
- // public double getInnerZ();
+ // TODO: Implement these for all calorimeter types.
+ /*
+ public double getInnerRadius();
+ public double getOuterRadius();
+ public double getInnerZ();
+ public double getOuterZ();
+ public double getInnerPhi();
+ public double getOuterPhi();
+ public double getInnerNumberOfSides();
+ public double getOuterNumberOfSides();
+ */
+
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.10 -r1.11
--- PolyhedraBarrelCalorimeter.java 18 Nov 2009 18:53:41 -0000 1.10
+++ PolyhedraBarrelCalorimeter.java 18 Dec 2009 19:32:28 -0000 1.11
@@ -26,16 +26,11 @@
zlength = node.getChild("dimensions").getAttribute("z").getDoubleValue();
orad = irad + getLayering().getThickness();
}
-
- /*
- public void appendHepRep(HepRepFactory factory, HepRep heprep)
- {
- DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 0, -1);
- }
- */
-
+
public boolean isBarrel()
{
return true;
}
+
+
}
\ No newline at end of file
