GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.2 -r1.3
--- CalorimeterType.java 1 Feb 2006 01:33:17 -0000 1.2
+++ CalorimeterType.java 24 Feb 2007 00:46:03 -0000 1.3
@@ -15,13 +15,33 @@
*
* @author jeremym
*/
+// FIXME: Change this to SubdetectorType and add the trackers (only a few types)
public enum CalorimeterType
{
FCAL("FCAL"),
ECAL("ECAL"),
HCAL("HCAL"),
- MUON("MUON"),
+ MUON("MUON"),
+ LUMI("LUMI"),
UNKNOWN("UNKNOWN");
+
+ /*
+ add for subdet type...
+
+ vertex_detector
+ silicon_tracker
+ tpc
+ generic_tracker
+
+ above should be...
+
+ forward_calorimeter
+ em_calorimeter
+ had_calorimeter
+ muon_calorimeter
+ luminosity_monitor
+ generic_calorimeter
+ */
String _typeName;
@@ -48,6 +68,10 @@
{
return MUON;
}
+ else if ( str.compareToIgnoreCase("lumi") == 0 )
+ {
+ return LUMI;
+ }
return UNKNOWN;
}
@@ -70,6 +94,10 @@
{
return "MUON";
}
+ else if ( caltype == LUMI)
+ {
+ return "LUMI";
+ }
return "UNKNOWN";
}
