Commit in hps-java/src/main/java/org/lcsim/hps/conditions on MAIN | |||
ConditionsDriver.java | +5 | -2 | 1.1 -> 1.2 |
use conditions keys instead of null to avoid errors
diff -u -r1.1 -r1.2 --- ConditionsDriver.java 16 Oct 2013 23:15:14 -0000 1.1 +++ ConditionsDriver.java 18 Oct 2013 05:48:03 -0000 1.2 @@ -8,6 +8,9 @@
import org.lcsim.hps.conditions.svt.SvtConditionsLoader; import org.lcsim.util.Driver;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CONDITIONS; +import static org.lcsim.hps.conditions.ConditionsConstants.ECAL_CONDITIONS; +
/** * This {@link org.lcsim.util.Driver} loads conditions onto an HPS detector. * @author Jeremy McCormick <[log in to unmask]>
@@ -28,7 +31,7 @@
*/ private void loadSvtConditions(Detector detector) { ConditionsManager manager = ConditionsManager.defaultInstance();
- SvtConditions conditions = manager.getCachedConditions(SvtConditions.class, null).getCachedData();
+ SvtConditions conditions = manager.getCachedConditions(SvtConditions.class, SVT_CONDITIONS).getCachedData();
SvtConditionsLoader loader = new SvtConditionsLoader(); loader.load(detector, conditions); }
@@ -39,7 +42,7 @@
*/ private void loadEcalConditions(Detector detector) { ConditionsManager manager = ConditionsManager.defaultInstance();
- EcalConditions conditions = manager.getCachedConditions(EcalConditions.class, null).getCachedData();
+ EcalConditions conditions = manager.getCachedConditions(EcalConditions.class, ECAL_CONDITIONS).getCachedData();
EcalConditionsLoader loader = new EcalConditionsLoader(); loader.load(detector, conditions); }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1