java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java 2014-04-03 21:49:17 UTC (rev 449)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java 2014-04-03 21:54:13 UTC (rev 450)
@@ -98,7 +98,7 @@
public FADCEcalReadoutDriver() {
flags = 0;
- flags += 1 << LCIOConstants.RCHBIT_TIME; //store cell ID
+ flags += 1 << LCIOConstants.RCHBIT_TIME; //store timestamp
hitClass = HPSRawCalorimeterHit.class;
setReadoutPeriod(ecalReadoutPeriod);
// converter = new HPSEcalConverter(null);
java/trunk/evio/src/main/java/org/hps/evio
--- java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java 2014-04-03 21:49:17 UTC (rev 449)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java 2014-04-03 21:54:13 UTC (rev 450)
@@ -15,6 +15,7 @@
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
import org.lcsim.event.base.BaseRawTrackerHit;
+import org.lcsim.lcio.LCIOConstants;
/**
*
@@ -36,6 +37,7 @@
boolean foundHits = false;
List<Object> hits = new ArrayList<Object>();
hitClass = Object.class;
+ int flags = 0;
for (BaseStructure bank : event.getChildren()) {
BaseStructureHeader header = bank.getHeader();
int crateBankTag = header.getTag();
@@ -66,14 +68,17 @@
case EventConstants.ECAL_WINDOW_BANK_TAG:
hits.addAll(makeWindowHits(cdata, crateBankTag));
hitClass = RawTrackerHit.class;
+ flags = 0;
break;
case EventConstants.ECAL_PULSE_BANK_TAG:
hits.addAll(makePulseHits(cdata, crateBankTag));
hitClass = RawTrackerHit.class;
+ flags = 0;
break;
case EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG:
hits.addAll(makeIntegralHits(cdata, crateBankTag));
hitClass = BaseRawCalorimeterHit.class;
+ flags = (1 << LCIOConstants.RCHBIT_TIME); //store timestamp
break;
default:
throw new RuntimeException("Unsupported ECal format - bank tag " + slotBank.getHeader().getTag());
@@ -87,7 +92,7 @@
}
}
String readoutName = EcalConditions.getSubdetector().getReadout().getName();
- lcsimEvent.put(hitCollectionName, hits, hitClass, 0, readoutName);
+ lcsimEvent.put(hitCollectionName, hits, hitClass, flags, readoutName);
// for (Object hit : hits) {
// System.out.println(((RawTrackerHit) hit).getIDDecoder().getIDDescription().toString());
// }
java/trunk/evio/src/main/java/org/hps/evio
--- java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java 2014-04-03 21:49:17 UTC (rev 449)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java 2014-04-03 21:54:13 UTC (rev 450)
@@ -394,7 +394,7 @@
List<RawCalorimeterHit> rawCalorimeterHits = event.get(RawCalorimeterHit.class, hitCollectionName);
System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in integral format");
int flags = 0;
- flags += 1 << LCIOConstants.RCHBIT_TIME; //store cell ID
+ flags += 1 << LCIOConstants.RCHBIT_TIME; //store timestamp
toEvent.put(hitCollectionName, rawCalorimeterHits, RawCalorimeterHit.class, flags, readoutName);
break;
default: