5 modified files
java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio
--- java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/ECalEvioReader.java 2014-08-28 02:39:58 UTC (rev 917)
+++ java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/ECalEvioReader.java 2014-08-28 08:14:53 UTC (rev 918)
@@ -3,18 +3,32 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
+import org.hps.conditions.ConditionsDriver;
+import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.TableConstants;
+import org.hps.conditions.ecal.EcalChannel;
+import org.hps.conditions.ecal.EcalChannel.DaqId;
+import org.hps.conditions.ecal.EcalChannel.GeometryId;
+import org.hps.conditions.ecal.EcalChannelConstants;
+import org.hps.conditions.ecal.EcalConditions;
+import org.hps.conditions.ecal.EcalConditionsUtil;
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.detector.identifier.IIdentifierHelper;
+import org.lcsim.detector.identifier.Identifier;
+//import org.hps.conditions.deprecated.EcalConditions;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.BaseStructureHeader;
import org.jlab.coda.jevio.CompositeData;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioException;
-import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
import org.lcsim.event.base.BaseRawTrackerHit;
+import org.lcsim.geometry.Detector;
+import org.lcsim.geometry.Subdetector;
import org.lcsim.lcio.LCIOConstants;
/**
@@ -27,9 +41,35 @@
private int bankTag = EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;
private Class hitClass = BaseRawCalorimeterHit.class;
+
+ // FIXME: Hard-coded detector names.
+ private static String readoutName = "EcalHits";
+ private static String subdetectorName = "Ecal";
+ Detector detector;
+ Subdetector subDetector;
+
+ static EcalConditions ecalConditions = null;
+ static IIdentifierHelper helper = null;
+ static EcalChannelCollection channels = null;
public ECalEvioReader() {
hitCollectionName = "EcalReadoutHits";
+
+ detector = DatabaseConditionsManager.getInstance().getDetectorObject();
+ subDetector = detector.getSubdetector(subdetectorName);
+
+ // ECAL combined conditions object.
+ ecalConditions = ConditionsManager.defaultInstance()
+ .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+
+ // List of channels.
+ channels = ecalConditions.getChannelCollection();
+
+ helper = subDetector.getDetectorElement().getIdentifierHelper();
+
+ System.out.println("You are now using the database conditions for ECalEvioReader.java");
+ // ID helper.
+// helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
}
@Override
@@ -91,7 +131,7 @@
}
}
}
- String readoutName = EcalConditions.getSubdetector().getReadout().getName();
+// String readoutName = ;
lcsimEvent.put(hitCollectionName, hits, hitClass, flags, readoutName);
// for (Object hit : hits) {
// System.out.println(((RawTrackerHit) hit).getIDDecoder().getIDDescription().toString());
@@ -126,22 +166,44 @@
if (debug) {
System.out.println(" channel=" + channel + "; nSamples=" + nSamples);
}
- Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);
+
+ long id = daqToGeometryId(crate, slot, channel);
+// Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);
+
+ System.out.println("The long id is: " + id);
+
short[] adcValues = new short[nSamples];
for (int i = 0; i < nSamples; i++) {
adcValues[i] = cdata.getShort();
}
- if (id == null) {
- System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
- } else {
- hits.add(new BaseRawTrackerHit(0, id, adcValues, new ArrayList<SimTrackerHit>(), EcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
- }
+// if (id == null) {
+// System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+// } else {
+ hits.add(new BaseRawTrackerHit(
+ 0,
+ id,
+ adcValues,
+ new ArrayList<SimTrackerHit>(),
+ subDetector
+ .getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
+// }
}
}
return hits;
}
+ private long daqToGeometryId(int crate, short slot, short channel) {
+ DaqId daqId = new DaqId(new int[]{crate,slot,channel});
+ EcalChannel ecalChannel = channels.findChannel(daqId);
+ if(ecalChannel == null) throw new RuntimeException("Daq Id not found.");
+ int ix = ecalChannel.getX();
+ int iy = ecalChannel.getY();
+ GeometryId geometryId = new GeometryId(helper, new int[]{subDetector.getSystemID(),ix,iy});
+ long id = geometryId.encode();
+ return id;
+ }
+
private List<BaseRawTrackerHit> makePulseHits(CompositeData cdata, int crate) {
List<BaseRawTrackerHit> hits = new ArrayList<BaseRawTrackerHit>();
if (debug) {
@@ -168,7 +230,7 @@
if (debug) {
System.out.println(" channel=" + channel + "; npulses=" + npulses);
}
- Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);
+ Long id = daqToGeometryId(crate, slot, channel);
for (int k = 0; k < npulses; k++) {
short pulseNum = cdata.getByte();
int sampleCount = cdata.getNValue();
@@ -179,7 +241,7 @@
if (id == null) {
System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
} else {
- hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), EcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
+ hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), subDetector.getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
}
}
}
@@ -213,7 +275,7 @@
if (debug) {
System.out.println(" channel=" + channel + "; npulses=" + npulses);
}
- Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);
+ Long id = daqToGeometryId(crate, slot, channel);
for (int k = 0; k < npulses; k++) {
short pulseTime = cdata.getShort();
java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio
--- java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/ECalHitWriter.java 2014-08-28 02:39:58 UTC (rev 917)
+++ java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/ECalHitWriter.java 2014-08-28 08:14:53 UTC (rev 918)
@@ -5,17 +5,30 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.TableConstants;
+import org.hps.conditions.ecal.EcalChannelConstants;
+import org.hps.conditions.ecal.EcalConditions;
+import org.hps.conditions.ecal.EcalConditionsUtil;
+import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
+import org.hps.conditions.ecal.EcalChannel.GeometryId;
+//import org.hps.conditions.deprecated.EcalConditions;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.CompositeData;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
import org.jlab.coda.jevio.EvioBank;
import org.jlab.coda.jevio.EvioException;
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierHelper;
+import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawCalorimeterHit;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.Subdetector;
import org.lcsim.lcio.LCIOConstants;
import static org.hps.evio.EventConstants.*;
@@ -30,8 +43,38 @@
private String hitCollectionName = "EcalReadoutHits";
private int mode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
- public ECalHitWriter() {
+ // FIXME: Hard-coded detector names.
+ private static String subdetectorName = "Ecal";
+ Detector detector = null;
+ public Subdetector subDetector;
+
+ static EcalConditions ecalConditions = null;
+ static IIdentifierHelper helper = null;
+ static EcalChannelCollection channels = null;
+
+ public ECalHitWriter() {
}
+
+ /**
+ * Must be set when an object EcalHitWriter is created.
+ * @param detector (long)
+ */
+ void setDetector(Detector detector) {
+
+ this.detector = detector;
+ subDetector = detector.getSubdetector(subdetectorName);
+
+ // ECAL combined conditions object.
+ ecalConditions = ConditionsManager.defaultInstance()
+ .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+
+ // List of channels.
+ channels = ecalConditions.getChannelCollection();
+
+ helper = subDetector.getDetectorElement().getIdentifierHelper();
+
+ System.out.println("You are now using the database conditions for ECalHitWriter.java");
+ }
public void setHitCollectionName(String hitCollectionName) {
this.hitCollectionName = hitCollectionName;
@@ -86,8 +129,8 @@
List<Object> topHits = new ArrayList<Object>();
List<Object> bottomHits = new ArrayList<Object>();
for (Object hit : rawCalorimeterHits) {
- Long daqID = EcalConditions.physicalToDaqID(getCellID(hit));
- int crate = EcalConditions.getCrate(daqID);
+// Long daqID = EcalConditions.physicalToDaqID(getCellID(hit));
+ int crate = getCrate(getCellID(hit));
if (crate == ECAL_BOTTOM_BANK_TAG) {
bottomHits.add(hit);
} else {
@@ -150,6 +193,7 @@
private long getCellID(Object hit) {
if (RawCalorimeterHit.class.isInstance(hit)) {
+ System.out.println("hit.getCellID() " + ((RawCalorimeterHit) hit).getCellID());
return ((RawCalorimeterHit) hit).getCellID();
} else if (RawTrackerHit.class.isInstance(hit)) {
return ((RawTrackerHit) hit).getCellID();
@@ -163,7 +207,7 @@
}
// Get the ID decoder.
- IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();
+ IDDecoder dec = subDetector.getIDDecoder();
// Make a hit map; allow for multiple hits in a crystal.
Map<Long, List<RawCalorimeterHit>> hitMap = new HashMap<Long, List<RawCalorimeterHit>>();
@@ -182,9 +226,9 @@
dec.setID(id);
// System.out.println(dec.getIDDescription());
// System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));
- Long daqID = EcalConditions.physicalToDaqID(id);
+// Long daqID = EcalConditions.physicalToDaqID(id);
// System.out.printf("physicalID %d, daqID %d\n", id, daqID);
- int slot = EcalConditions.getSlot(daqID);
+ int slot = getSlot(id);
if (slotMap.get(slot) == null) {
slotMap.put(slot, new ArrayList<Long>());
}
@@ -205,7 +249,7 @@
data.addN(nhits); // number of channels
for (Long id : hitIDs) {
dec.setID(id);
- int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));
+ int channel = getChannel(id);
data.addUchar((byte) channel); // channel #
List<RawCalorimeterHit> channelHits = hitMap.get(id);
data.addN(channelHits.size()); // number of pulses
@@ -236,7 +280,7 @@
}
// Get the ID decoder.
- IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();
+ IDDecoder dec = subDetector.getIDDecoder();
// Make a hit map; allow for multiple hits in a crystal.
Map<Long, List<RawTrackerHit>> hitMap = new HashMap<Long, List<RawTrackerHit>>();
@@ -255,9 +299,9 @@
dec.setID(id);
// System.out.println(dec.getIDDescription());
// System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));
- Long daqID = EcalConditions.physicalToDaqID(id);
+// Long daqID = EcalConditions.physicalToDaqID(id);
// System.out.printf("physicalID %d, daqID %d\n", id, daqID);
- int slot = EcalConditions.getSlot(daqID);
+ int slot = getSlot(id);
if (slotMap.get(slot) == null) {
slotMap.put(slot, new ArrayList<Long>());
}
@@ -278,7 +322,7 @@
data.addN(nhits); // number of channels
for (Long id : hitIDs) {
dec.setID(id);
- int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));
+ int channel = getChannel(id);
data.addUchar((byte) channel); // channel #
List<RawTrackerHit> channelHits = hitMap.get(id);
data.addN(channelHits.size()); // number of pulses
@@ -313,7 +357,7 @@
}
// Get the ID decoder.
- IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();
+ IDDecoder dec = subDetector.getIDDecoder();
// Make a hit map; allow for multiple hits in a crystal.
Map<Long, RawTrackerHit> hitMap = new HashMap<Long, RawTrackerHit>();
@@ -328,9 +372,9 @@
dec.setID(id);
// System.out.println(dec.getIDDescription());
// System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));
- Long daqID = EcalConditions.physicalToDaqID(id);
+// Long daqID = EcalConditions.physicalToDaqID(id);
// System.out.printf("physicalID %d, daqID %d\n", id, daqID);
- int slot = EcalConditions.getSlot(daqID);
+ int slot = getSlot(id);
if (slotMap.get(slot) == null) {
slotMap.put(slot, new ArrayList<Long>());
}
@@ -355,7 +399,7 @@
data.addN(nhits); // number of channels
for (Long id : hitIDs) {
dec.setID(id);
- int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));
+ int channel = getChannel(id);
data.addUchar((byte) channel); // channel #
RawTrackerHit hit = hitMap.get(id);
data.addN(hit.getADCValues().length); // number of samples
@@ -382,7 +426,7 @@
@Override
public void writeData(EventHeader event, EventHeader toEvent) {
- String readoutName = EcalConditions.getSubdetector().getReadout().getName();
+ String readoutName = ((org.lcsim.geometry.compact.Subdetector) subDetector).getReadout().getName();
switch (mode) {
case EventConstants.ECAL_WINDOW_MODE:
case EventConstants.ECAL_PULSE_MODE:
@@ -401,4 +445,49 @@
break;
}
}
+
+
+
+ /**
+ * Return crate number from cellID
+ * @param cellID (long)
+ * @return Crate number (int)
+ */
+ private int getCrate(long cellID) {
+
+ EcalConditionsUtil util = new EcalConditionsUtil();
+
+ // Find the ECAL channel and return the crate number.
+ return util.getCrate(helper, cellID);
+ }
+
+ /**
+ * Return slot number from cellID
+ * @param cellID (long)
+ * @return Slot number (int)
+ */
+ private int getSlot(long cellID) {
+ EcalConditionsUtil util = new EcalConditionsUtil();
+
+ // Find the ECAL channel and return the crate number.
+ return util.getSlot(helper, cellID);
+ }
+
+ private int getChannel(long cellID){
+ // Make an ID object from hit ID.
+ IIdentifier idd = new Identifier(cellID);
+
+ // Get physical field values.
+ int system = helper.getValue(idd, "system");
+ int x = helper.getValue(idd, "ix");
+ int y = helper.getValue(idd, "iy");
+
+ // Create an ID to search for in channel collection.
+ GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
+
+ // Get the channel data.
+ return channels.findChannel(geometryId).getChannelId();
+
+ }
+
}
java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio
--- java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunReconToEvio.java 2014-08-28 02:39:58 UTC (rev 917)
+++ java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunReconToEvio.java 2014-08-28 08:14:53 UTC (rev 918)
@@ -2,12 +2,16 @@
import java.io.IOException;
+import org.hps.conditions.TableConstants;
+import org.hps.conditions.ecal.EcalConditions;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
import org.jlab.coda.jevio.EventWriter;
import org.jlab.coda.jevio.EvioBank;
import org.jlab.coda.jevio.EvioException;
+import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
+import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
/**
@@ -26,9 +30,17 @@
private int eventsWritten = 0;
ECalHitWriter ecalWriter = null;
SVTHitWriter svtWriter = null;
+
+ Detector detector = null;
public TestRunReconToEvio() {
}
+
+ @Override
+ public void detectorChanged(Detector detector) {
+ // set the detector
+ this.detector = detector;
+ }
public void setEvioOutputFile(String evioOutputFile) {
this.evioOutputFile = evioOutputFile;
@@ -49,6 +61,7 @@
}
ecalWriter = new ECalHitWriter();
+ ecalWriter.setDetector(detector);
ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
svtWriter = new SVTHitWriter();
java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio
--- java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java 2014-08-28 02:39:58 UTC (rev 917)
+++ java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java 2014-08-28 08:14:53 UTC (rev 918)
@@ -6,8 +6,9 @@
import java.util.List;
import java.util.Queue;
+import org.hps.conditions.DatabaseConditionsManager;
import org.hps.conditions.deprecated.CalibrationDriver;
-import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.conditions.ecal.EcalConditions;
import org.hps.readout.ecal.TriggerDriver;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
@@ -15,6 +16,7 @@
import org.jlab.coda.jevio.EvioBank;
import org.jlab.coda.jevio.EvioException;
import org.lcsim.event.EventHeader;
+import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
/**
@@ -38,9 +40,18 @@
TriggerDataWriter triggerWriter = null;
List<HitWriter> writers = null;
private int ecalMode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
+
+ Detector detector;
public TestRunTriggeredReconToEvio() {
}
+
+ @Override
+ public void detectorChanged(Detector detector) {
+ //ecalWriter.setDetector(detector);
+ if(detector == null) System.out.println("detectorChanged, Detector == null");
+ else System.out.println("detectorChanged, Detector != null");
+ }
public void setEcalMode(int ecalMode) {
this.ecalMode = ecalMode;
@@ -72,12 +83,17 @@
}
writePrestartEvent();
+ this.detector = DatabaseConditionsManager.getInstance().getDetectorObject();
writers = new ArrayList<HitWriter>();
ecalWriter = new ECalHitWriter();
+ if(detector == null) System.out.println("Detector == null");
+ else System.out.println("Detector != null");
+ //ecalWriter.setDetector(detector);
ecalWriter.setMode(ecalMode);
ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
+ ecalWriter.setDetector(detector);
writers.add(ecalWriter);
svtWriter = new SVTHitWriter();
java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio
--- java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java 2014-08-28 02:39:58 UTC (rev 917)
+++ java/branches/evio_HPSJAVA-93/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java 2014-08-28 08:14:53 UTC (rev 918)
@@ -19,6 +19,7 @@
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.SimTrackerHit;
+import org.lcsim.geometry.Detector;
import org.lcsim.lcio.LCIOWriter;
import org.lcsim.util.Driver;
@@ -56,9 +57,17 @@
static final String ecalCollectionName = "EcalHits";
static final String trackerCollectionName = "TrackerHits";
private String relationCollectionName = "SVTTrueHitRelations";
+
+ Detector detector = null;
public TestRunTriggeredReconToLcio() {
}
+
+ @Override
+ public void detectorChanged(Detector detector) {
+ // set the detector
+ this.detector = detector;
+ }
public void setEcalMode(int ecalMode) {
this.ecalMode = ecalMode;
@@ -94,6 +103,7 @@
writers = new ArrayList<HitWriter>();
ecalWriter = new ECalHitWriter();
+ ecalWriter.setDetector(detector);
ecalWriter.setMode(ecalMode);
ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
writers.add(ecalWriter);
SVNspam 0.1
