Author: [log in to unmask]
Date: Thu Feb 11 13:16:14 2016
New Revision: 4202
Log:
Replace file with trunk copy so merge works without conflicts.
Added:
java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java (contents, props changed)
- copied, changed from r4201, java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java
Copied: java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java (from r4201, java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java Thu Feb 11 13:16:14 2016
@@ -122,10 +122,10 @@
if (runNum != currentRun) {
if (useTI && !useCrawlerTI) {
RunManager.getRunManager().setRun(runNum);
- if (!RunManager.getRunManager().runExists() || RunManager.getRunManager().getTriggerConfig().getTiTimeOffset() == null) {
+ if (!RunManager.getRunManager().runExists() || RunManager.getRunManager().getRunSummary().getTiTimeOffset() == null) {
continue;
}
- tiTimeOffset = RunManager.getRunManager().getTriggerConfig().getTiTimeOffset();
+ tiTimeOffset = RunManager.getRunManager().getRunSummary().getTiTimeOffset();
if (tiTimeOffset == 0) {
continue;
}
|