Print

Print


Commit in lcsim/src/org/lcsim/util on MAIN
OverlayDriver.java+5-21.13 -> 1.14
Use the correct string to identify readout name

lcsim/src/org/lcsim/util
OverlayDriver.java 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- OverlayDriver.java	10 Jul 2012 07:58:11 -0000	1.13
+++ OverlayDriver.java	19 Jul 2012 22:31:24 -0000	1.14
@@ -27,6 +27,7 @@
 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.SimTrackerHit;
 import org.lcsim.event.EventHeader.LCMetaData;
+import org.lcsim.event.base.BaseLCSimEvent;
 import org.lcsim.event.base.BaseMCParticle;
 import org.lcsim.event.base.BaseSimCalorimeterHit;
 import org.lcsim.event.base.BaseSimTrackerHit;
@@ -430,7 +431,7 @@
 	 * @param event the event to put the collection
 	 */
 	protected void putCollection(LCMetaData collection, List entries, EventHeader event) {
-		String[] readout = collection.getStringParameters().get("READOUT_NAME");
+		String[] readout = collection.getStringParameters().get(BaseLCSimEvent.READOUT_NAME);
 		if (readout != null) {
 			event.put(collection.getName(), entries, collection.getType(), collection.getFlags(), readout[0]);
 		} else {
@@ -561,6 +562,7 @@
 					// need to set time to 0 so it is recalculated from the timeList
 					movedHit = new BaseSimCalorimeterHit(hit.getCellID(),
 							rawEnergy, 0., mcArr, eneArr, timeArr, pdgArr);
+					//movedHit.setDetectorElement(hit.getDetectorElement());
 					movedHit.setMetaData(collection);
 				} else {
 					double hitTime = hit.getTime() + time;
@@ -709,7 +711,7 @@
 		}
 		
 		BaseSimCalorimeterHit copyHit = new BaseSimCalorimeterHit(id, rawEnergy, time, mcparts, energies, times, pdgs);
-		
+		//copyHit.setDetectorElement(hit.getDetectorElement());
 		copyHit.setMetaData(meta);
 		
 		return copyHit;
@@ -819,6 +821,7 @@
 					// need to set time to 0 so it is recalculated from the timeList
 					SimCalorimeterHit mergedHit = new BaseSimCalorimeterHit(oldHit.getCellID(),
 							rawEnergy, 0., mcpList, eneList, timeList, pdgList);
+					//mergedHit.setDetectorElement(oldHit.getDetectorElement());
 					mergedHit.setMetaData(collection);
 					// replace old hit with merged hit
 					signalCaloHits.remove(oldHit);
CVSspam 0.2.12


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