Commit in hps-java/src/main/java/org/lcsim/hps/evio on MAIN | |||
LCSimTestRunEventBuilder.java | +3 | -3 | 1.25 -> 1.26 |
TestRunEvioToLcio.java | -2 | 1.27 -> 1.28 | |
+3 | -5 |
load ECal DAQ maps in eventbuilder
diff -u -r1.25 -r1.26 --- LCSimTestRunEventBuilder.java 18 Apr 2013 20:59:16 -0000 1.25 +++ LCSimTestRunEventBuilder.java 4 Jun 2013 22:35:28 -0000 1.26 @@ -10,7 +10,7 @@
import org.lcsim.event.EventHeader; import org.lcsim.event.base.BaseLCSimEvent; import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.SvtUtils;
+import org.lcsim.hps.recon.ecal.EcalConditions;
/** * Build LCSim events from EVIO data.
@@ -43,6 +43,7 @@
// Make a dummy event to setup the conditions system. EventHeader dummyEvent = new BaseLCSimEvent(0, 0, detectorName); detector = dummyEvent.getDetector();
+ EcalConditions.loadDaqMap(detector, "Ecal");
} @Override
@@ -164,8 +165,7 @@
} // Create a new LCSimEvent.
- EventHeader lcsimEvent = null; - lcsimEvent = new BaseLCSimEvent(run, eventID[0], detector.getDetectorName(), time);
+ EventHeader lcsimEvent = new BaseLCSimEvent(run, eventID[0], detector.getDetectorName(), time);
lcsimEvent.put("TriggerBank", triggerList, TriggerData.class, 0); return lcsimEvent;
diff -u -r1.27 -r1.28 --- TestRunEvioToLcio.java 18 Apr 2013 20:59:16 -0000 1.27 +++ TestRunEvioToLcio.java 4 Jun 2013 22:35:28 -0000 1.28 @@ -179,8 +179,6 @@
LCSimEventBuilder eventBuilder = new LCSimTestRunEventBuilder(); eventBuilder.setDetectorName(detectorName);
- EcalConditions.loadDaqMap(DetectorLocator.findDetector(detectorName), "Ecal"); -
for (String evioFileName : cl.getArgs()) { // EVIO input file. File evioFile = new File(evioFileName);
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