Merge branch 'master' into iss221

Author: JeremyMcCormick

detector-model/pom.xml

@@ -27,7 +27,7 @@
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>org.lcsim.geometry.compact.converter.Main</mainClass>
+                  <mainClass>org.hps.detector.DetectorConverter</mainClass>
                 </transformer>
               </transformers>
               <artifactSet>

detector-model/src/main/java/org/hps/detector/DetectorConverter.java

@@ -80,9 +80,7 @@ private void run(String args[]) throws Exception {
         }
         if (cl.hasOption("r")) {
             runNumber = Integer.parseInt(cl.getOptionValue("r"));
-        } else {
-            runNumber = 0;
-        }
+        } 
 
         Converter cnv = null;
 
@@ -105,8 +103,8 @@ private void run(String args[]) throws Exception {
             throw new IllegalArgumentException("No converter found for format: " + outputFormat);
 
         if (runNumber != null) {
+            DatabaseConditionsManager mgr = new DatabaseConditionsManager();
             String name = "DUMMY";
-            DatabaseConditionsManager mgr = DatabaseConditionsManager.getInstance();
             ConditionsReader dummyReader = ConditionsReader.createDummy();
             ((ConditionsManagerImplementation) mgr).setConditionsReader(dummyReader, name);
             DummyDetector detector = new DummyDetector(name);