From d0e1f5e4cc22f02bd9dd2be3b0e00e8456e57de1 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Mon, 2 Dec 2019 21:34:53 -0500
Subject: [PATCH] fix merge conflict
---
src/THcHelicity.cxx | 1 -
src/THcHelicityReader.cxx | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/THcHelicity.cxx b/src/THcHelicity.cxx
index 7203fc6..15fd0e5 100644
--- a/src/THcHelicity.cxx
+++ b/src/THcHelicity.cxx
@@ -501,7 +501,6 @@ Int_t THcHelicity::Decode(const THaEvData& evdata) {
// cout << fTITime/250000000.0 << " " << fNCycle << " " << fReportedHelicity << endl;
// cout << fNCycle << ": " << fReportedHelicity << " "
// << fPredictedHelicity << " " << fActualHelicity << endl;
->>>>>>> 77b916167fbc44bfd82e8c4fe2b063c386e89d99
}
// Ignore until a MPS Is found
} else { // No MPS found yet
diff --git a/src/THcHelicityReader.cxx b/src/THcHelicityReader.cxx
index c0e1892..3dfa4dd 100644
--- a/src/THcHelicityReader.cxx
+++ b/src/THcHelicityReader.cxx
@@ -167,7 +167,7 @@ Int_t THcHelicityReader::SetROCinfo(EROC which, Int_t roc, Int_t slot, Int_t ind
fROCinfo[which].slot = slot;
fROCinfo[which].index = index;
- logger_->info("SetROCInfo: {} (roc: {}, slot: {}, index: {})", which, fROCinfo[which].roc,
+ _logger->info("SetROCInfo: {} (roc: {}, slot: {}, index: {})", which, fROCinfo[which].roc,
fROCinfo[which].slot, fROCinfo[which].index);
fHaveROCs = (fROCinfo[kHel].roc > 0 && fROCinfo[kTime].roc > 0 && fROCinfo[kMPS].roc);
--
GitLab