--- projects/lcsim/trunk/event-processing/src/main/java/org/lcsim/util/loop/LCSimLoop.java	2014-09-30 23:23:47 UTC (rev 3353)
+++ projects/lcsim/trunk/event-processing/src/main/java/org/lcsim/util/loop/LCSimLoop.java	2014-10-01 02:16:45 UTC (rev 3354)
@@ -13,7 +13,6 @@

 import org.lcsim.event.util.LCSimEventGenerator;
 import org.lcsim.util.Driver;
 import org.lcsim.util.DriverAdapter;

-//import org.lcsim.util.RunListener;

 
 /**
  * A main loop which can be used for standalone jobs (run outside of JAS).

@@ -27,11 +26,11 @@

      * Create a new LCSimLoop
      */
     public LCSimLoop() {

-        //if (!ConditionsManager.isSetup())
-        LCSimConditionsManagerImplementation.register();

+        // Is there no global conditions manager installed yet?
+        if (!ConditionsManager.isSetup()) 
+            // Register a default conditions manager, which can still be overridden later if needed.
+            LCSimConditionsManagerImplementation.register();

         DriverAdapter da = new DriverAdapter(top);

-        //RunListener runListener = new RunListener(top);
-        //addRecordListener(runListener);

         addRecordListener(da);
         addLoopListener(da);
     }