From f1a64cc1768efaf6fccebaaa4ac4fbd4ff3f8467 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Sun, 8 Dec 2019 05:56:36 -0500
Subject: [PATCH] Fixed typo
---
src/THcHelicity.cxx | 2 +-
src/THcHelicityScaler.h | 125 ++++++++++++++++++++--------------------
2 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/src/THcHelicity.cxx b/src/THcHelicity.cxx
index 8cf3f90..c654837 100644
--- a/src/THcHelicity.cxx
+++ b/src/THcHelicity.cxx
@@ -620,7 +620,7 @@ void THcHelicity::LoadHelicity(Int_t reportedhelicity, Int_t cyclecount, Int_t m
_logger->info("Seed Found {} at cycle {} with first cycle {}",
bitset<32>(fRingSeed_reported), cyclecount, fFirstCycle);
if (fglHelicityScaler) {
- _logger->info("Scaler Seed {}", bitset<32>(fScalerSeed) << endl;
+ _logger->info("Scaler Seed {}", bitset<32>(fScalerSeed));
}
Int_t backseed = GetSeed30(fRingSeed_reported);
_logger->info("Seed at cycle {} should be {x}", fFirstCycle, backseed);
diff --git a/src/THcHelicityScaler.h b/src/THcHelicityScaler.h
index d467483..e065257 100644
--- a/src/THcHelicityScaler.h
+++ b/src/THcHelicityScaler.h
@@ -8,81 +8,78 @@
//
/////////////////////////////////////////////////////////////////////
-#include "THaEvtTypeHandler.h"
#include "Decoder.h"
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <set>
-#include "TTree.h"
+#include "THaEvtTypeHandler.h"
#include "TString.h"
+#include "TTree.h"
+#include <algorithm>
#include <cstring>
+#include <set>
+#include <string>
+#include <vector>
class THcHelicity;
class THcHelicityScaler : public THaEvtTypeHandler {
public:
-
- THcHelicityScaler(const char*, const char*);
- virtual ~THcHelicityScaler();
-
- Int_t Analyze(THaEvData *evdata);
- Int_t AnalyzeBuffer(UInt_t *rdata, Bool_t onlysync);
- Int_t AnalyzeHelicityScaler(UInt_t *p);
-
- virtual EStatus Init( const TDatime& run_time);
- virtual Int_t ReadDatabase(const TDatime& date );
- virtual Int_t End( THaRunBase* r=0 );
-
- virtual void SetUseFirstEvent(Bool_t b = kFALSE) {fUseFirstEvent = b;}
- virtual void SetDelayedType(int evtype);
- virtual void SetROC(Int_t roc) {fROC=roc;}
- virtual void SetBankID(Int_t bankid) {fBankID=bankid;}
- virtual void SetHelicityDetector(THcHelicity *f) {fglHelicityDetector = f;}
- virtual Int_t GetNevents() { return fNevents;}
- virtual Int_t GetNcycles() { return fNcycles;}
- virtual Int_t GetEvNum() { return evNumber;}
- virtual Int_t* GetHelicityHistoryP() {return fHelicityHistory;}
+ THcHelicityScaler(const char*, const char*);
+ virtual ~THcHelicityScaler();
+
+ Int_t Analyze(THaEvData* evdata);
+ Int_t AnalyzeBuffer(UInt_t* rdata, Bool_t onlysync);
+ Int_t AnalyzeHelicityScaler(UInt_t* p);
+
+ virtual EStatus Init(const TDatime& run_time);
+ virtual Int_t ReadDatabase(const TDatime& date);
+ virtual Int_t End(THaRunBase* r = 0);
+
+ virtual void SetUseFirstEvent(Bool_t b = kFALSE) { fUseFirstEvent = b; }
+ virtual void SetDelayedType(int evtype);
+ virtual void SetROC(Int_t roc) { fROC = roc; }
+ virtual void SetBankID(Int_t bankid) { fBankID = bankid; }
+ virtual void SetHelicityDetector(THcHelicity* f) { fglHelicityDetector = f; }
+ virtual Int_t GetNevents() { return fNevents; }
+ virtual Int_t GetNcycles() { return fNcycles; }
+ virtual Int_t GetEvNum() { return evNumber; }
+ virtual Int_t* GetHelicityHistoryP() { return fHelicityHistory; }
private:
-
- static size_t FindNoCase(const std::string& sdata, const std::string& skey);
-
- Int_t fNumBCMs;
- Double_t *fBCM_Gain;
- Double_t *fBCM_Offset;
- Double_t *fBCM_delta_charge;
-
- Int_t fROC;
- UInt_t fBankID;
- // Helicity Scaler variables
- Int_t fNevents; /* # of helicity scaler reads in last event */
- Int_t fNcycles;
- Int_t fHelicityHistory[200];
- //
- Bool_t fUseFirstEvent;
- Bool_t fOnlySyncEvents;
- Bool_t fOnlyBanks;
- Int_t fDelayedType;
- Int_t fClockChan;
- UInt_t fLastClock;
- Int_t fClockOverflows;
-
- std::vector<UInt_t*> fDelayedEvents;
- std::set<UInt_t> fRocSet;
-
- THcHelicityScaler(const THcHelicityScaler& fh);
- THcHelicityScaler& operator=(const THcHelicityScaler& fh);
-
- UInt_t evcount;
- Double_t evcountR;
- UInt_t evNumber;
- Int_t ifound;
- THcHelicity *fglHelicityDetector;
-
- ClassDef(THcHelicityScaler,0) // Scaler Event handler
-
+ static size_t FindNoCase(const std::string& sdata, const std::string& skey);
+
+ Int_t fNumBCMs;
+ Double_t* fBCM_Gain;
+ Double_t* fBCM_Offset;
+ Double_t* fBCM_delta_charge;
+
+ Int_t fROC;
+ UInt_t fBankID;
+ // Helicity Scaler variables
+ Int_t fNevents; /* # of helicity scaler reads in last event */
+ Int_t fNcycles;
+ Int_t fHelicityHistory[200];
+ //
+ Bool_t fUseFirstEvent;
+ Bool_t fOnlySyncEvents;
+ Bool_t fOnlyBanks;
+ Int_t fDelayedType;
+ Int_t fClockChan;
+ UInt_t fLastClock;
+ Int_t fClockOverflows;
+
+ std::vector<UInt_t*> fDelayedEvents;
+ std::set<UInt_t> fRocSet;
+
+ THcHelicityScaler(const THcHelicityScaler& fh);
+ THcHelicityScaler& operator=(const THcHelicityScaler& fh);
+
+ UInt_t evcount;
+ Double_t evcountR;
+ UInt_t evNumber;
+ Int_t ifound;
+ THcHelicity* fglHelicityDetector;
+
+ ClassDef(THcHelicityScaler, 0) // Scaler Event handler
};
#endif
--
GitLab