6 modified files
java/branches/hps_java_trunk_HPSJAVA-251/conditions/src/main/resources/org/hps/conditions/config
--- java/branches/hps_java_trunk_HPSJAVA-251/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml 2014-09-12 05:59:10 UTC (rev 1017)
@@ -6,6 +6,7 @@
<converter class="org.hps.conditions.ConditionsRecordConverter"/>
<!-- SVT converters -->
+<!--
<converter class="org.hps.conditions.svt.SvtConditionsConverter"/>
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtBadChannelConverter"/>
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtCalibrationConverter"/>
@@ -14,6 +15,7 @@
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtGainConverter"/>
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtPulseParametersConverter"/>
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtTimeShiftConverter"/>
+-->
<!-- ECal converters -->
<converter class="org.hps.conditions.ecal.EcalConditionsConverter"/>
@@ -49,7 +51,8 @@
<field name="collection_id" />
</fields>
</table>
-
+
+<!--
<table key="svt_channels" name="svt_channels">
<classes>
<object class="org.hps.conditions.svt.SvtChannel"/>
@@ -135,6 +138,7 @@
<field name="hybrid" />
</fields>
</table>
+-->
<table key="ecal_bad_channels" name="ecal_bad_channels">
<classes>
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java 2014-09-12 05:59:10 UTC (rev 1017)
@@ -37,7 +37,7 @@
static IIdentifierHelper helper = null;
static EcalChannelCollection channels = null;
- EcalConditionsUtil util = new EcalConditionsUtil();
+ EcalConditionsUtil util;
Detector detector = null;
@@ -131,6 +131,8 @@
// ID helper.
helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
+
+ util = new EcalConditionsUtil();
System.out.println("You are now using the database conditions for EcalRawConverterDriver.");
}
java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio
--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java 2014-09-12 05:59:10 UTC (rev 1017)
@@ -164,6 +164,7 @@
// LCSim job manager.
JobControlManager jobManager = new JobControlManager();
+ int conditionsRunNumber = 0;
if (cl.hasOption("D")) {
String[] steeringOptions = cl.getOptionValues("D");
for (String def : steeringOptions) {
@@ -174,12 +175,18 @@
String key = s[0];
String value = s[1];
jobManager.addVariableDefinition(key, value);
+
+ if (key.equals("runNumber")) {
+ conditionsRunNumber = Integer.parseInt(value);
+ }
}
}
jobManager.setup(steeringStream);
jobManager.configure();
+ new org.hps.conditions.config.TestRunReadOnlyConfiguration(false).setup().load(detectorName, conditionsRunNumber);
+
// LCSim event builder.
LCSimEventBuilder eventBuilder = new LCSimTestRunEventBuilder();
eventBuilder.setDetectorName(detectorName);
@@ -306,4 +313,4 @@
System.out.println("closed writer");
}
}
-}
\ No newline at end of file
+}
java/branches/hps_java_trunk_HPSJAVA-251
--- java/branches/hps_java_trunk_HPSJAVA-251/run_ecal_readout_sim_test.sh 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/run_ecal_readout_sim_test.sh 2014-09-12 05:59:10 UTC (rev 1017)
@@ -7,5 +7,5 @@
#
infile="/nfs/slac/g/hps2/hps_data/lcio/prop-v3/e2.2gev/ap_beam_tri/075/ap075mev_egs_tri_2.2gev_0.00125x0_200na_5e5b_30mr_001_SLIC-v2r11p1_geant4-v9r3p2_QGSP_BERT_HPS-Proposal2014-v3-2pt2.slcio"
-
+rm readout.slcio readout.triggers
java -jar distribution/target/hps-distribution-3.0.3-SNAPSHOT-bin.jar -r /org/hps/steering/readout/TestRunReadoutToLcio.lcsim -i $infile -DoutputFile=readout -DrunNumber=1351
java/branches/hps_java_trunk_HPSJAVA-251
--- java/branches/hps_java_trunk_HPSJAVA-251/run_evio_to_lcio_recon_test.sh 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/run_evio_to_lcio_recon_test.sh 2014-09-12 05:59:10 UTC (rev 1017)
@@ -1,3 +1,3 @@
infile="/nfs/slac/g/hps3/data/testrun/runs/evio/hps_001351.evio.0"
java -cp distribution/target/hps-distribution-3.0.3-SNAPSHOT-bin.jar org.hps.evio.TestRunEvioToLcio \
--r -x /org/hps/steering/recon/TestRunOfflineRecon.lcsim -d HPS-TestRun-v8-5 $infile -DoutputFile=recon.slcio -DrunNumber=1351
+-r -x /org/hps/steering/recon/TestRunOfflineRecon.lcsim -d HPS-TestRun-v8-5 $infile -DoutputFile=recon -DrunNumber=1351
java/branches/hps_java_trunk_HPSJAVA-251/steering-files/src/main/resources/org/hps/steering/recon
--- java/branches/hps_java_trunk_HPSJAVA-251/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-09-12 04:10:09 UTC (rev 1016)
+++ java/branches/hps_java_trunk_HPSJAVA-251/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-09-12 05:59:10 UTC (rev 1017)
@@ -7,6 +7,7 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
+ <driver name="ConditionsDriver"/>
<driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" />
@@ -25,6 +26,7 @@
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>${runNumber}</runNumber>
</driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver"/>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
SVNspam 0.1