hps-java/src/main/java/org/lcsim/hps/recon/ecal
diff -u -r1.13 -r1.14
--- HPSEcalFADCReadoutDriver.java 7 Jun 2012 00:47:30 -0000 1.13
+++ HPSEcalFADCReadoutDriver.java 11 Jun 2012 22:54:48 -0000 1.14
@@ -26,7 +26,7 @@
* Simulates time evolution of preamp output pulse.
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalFADCReadoutDriver.java,v 1.13 2012/06/07 00:47:30 meeg Exp $
+ * @version $Id: HPSEcalFADCReadoutDriver.java,v 1.14 2012/06/11 22:54:48 meeg Exp $
*/
public class HPSEcalFADCReadoutDriver extends HPSEcalReadoutDriver<RawCalorimeterHit> {
@@ -50,10 +50,10 @@
private int delay0 = 32;
//start of readout window relative to trigger time (in readout cycles)
//in FADC documentation, "Programmable Latency" or PL
- private int readoutLatency = 200;
+ private int readoutLatency = 100;
//number of ADC samples to read out
//in FADC documentation, "Programmable Trigger Window" or PTW
- private int readoutWindow = 200;
+ private int readoutWindow = 100;
//number of ADC samples to read out before each rising threshold crossing
//in FADC documentation, "number of samples before" or NSB
private int numSamplesBefore = 10;
hps-java/src/main/java/org/lcsim/hps/recon/ecal
diff -u -r1.11 -r1.12
--- HPSEcalConditions.java 6 Jun 2012 18:29:01 -0000 1.11
+++ HPSEcalConditions.java 11 Jun 2012 22:54:48 -0000 1.12
@@ -17,7 +17,7 @@
/**
*
* @author meeg
- * @version $Id: HPSEcalConditions.java,v 1.11 2012/06/06 18:29:01 phansson Exp $
+ * @version $Id: HPSEcalConditions.java,v 1.12 2012/06/11 22:54:48 meeg Exp $
*/
public class HPSEcalConditions extends Driver {
@@ -213,6 +213,7 @@
} else {
int x = Integer.valueOf(lineTok.nextToken());
int y = Integer.valueOf(lineTok.nextToken());
+// if (x>0 && y>0) x = 24-x;
expId.setValue(helper.getFieldIndex("ix"), x);
expId.setValue(helper.getFieldIndex("iy"), y);
int crate = Integer.valueOf(lineTok.nextToken());
hps-java/src/main/java/org/lcsim/hps/evio
diff -u -r1.12 -r1.13
--- TestRunTriggeredReconToEvio.java 7 Jun 2012 00:47:30 -0000 1.12
+++ TestRunTriggeredReconToEvio.java 11 Jun 2012 22:54:48 -0000 1.13
@@ -156,7 +156,7 @@
// Make a new EVIO event.
EventBuilder builder = new EventBuilder(EventConstants.PRESTART_EVENT_TAG, DataType.UINT32, EventConstants.EVENT_BANK_NUM);
int[] prestartData = new int[3];
- prestartData[0] = 0; //Unix time in seconds - use 0 for MC data
+ prestartData[0] = 2019686400; //Unix time in seconds - this value for MC data
prestartData[1] = 0; //run number
prestartData[2] = 0; //run type