src/PRadException.cxx

-//============================================================================//
-// A exception class for PRad Event Viewer                                    //
-//                                                                            //
-// Chao Peng                                                                  //
-// 02/27/2016                                                                 //
-//============================================================================//
-
-#include "PRadException.h"
-
-using namespace std;
-
-PRadException::PRadException(const string &typ, const string &txt, const string &aux)
-: title(typ), text(txt), auxText(aux)
-{
-}
-
-PRadException::PRadException(PRadExceptionType typ, const string &txt, const string &aux)
-: type(typ), text(txt), auxText(aux)
-{
-}
-
-PRadException::PRadException(PRadExceptionType typ, const string &txt, const string &file, const string &func, int line)
-: type(typ), text(txt)
-{
-    ostringstream oss;
-    oss <<  "    evioException occured in file " << file << ", function " << func << ", line " << line;
-    auxText=oss.str();
-}
-
-
-string PRadException::FailureDesc(void) const
-{
-    ostringstream oss;
-    oss << text << endl
-        << auxText;
-    return(oss.str());
-}
-
-string PRadException::FailureType(void) const
-{
-    if(!title.empty())
-        return title;
-
-    string oss;
-    switch(type)
-    {
-    case ET_CONNECT_ERROR:
-        oss = "ET CONNECT ERROR";
-        break;
-    case ET_CONFIG_ERROR:
-        oss = "ET CONFIG ERROR";
-        break;
-    case ET_STATION_CONFIG_ERROR:
-        oss = "ET STATION CONFIG ERROR";
-        break;
-    case ET_STATION_CREATE_ERROR:
-        oss = "ET STATION CREATE ERROR";
-        break;
-    case ET_STATION_ATTACH_ERROR:
-        oss = "ET ATTACH ERROR";
-        break;
-    case ET_READ_ERROR:
-        oss = "ET READ ERROR";
-        break;
-    case ET_PUT_ERROR:
-        oss = "ET PUT ERROR";
-        break;
-    case HIGH_VOLTAGE_ERROR:
-        oss = "HIGH VOLTAGE SYSTEM ERROR";
-        break;
-    default:
-        oss = "UNKNOWN ERROR";
-        break;
-    }
-
-    return(oss);
-}
-
-const char* PRadException::what() const noexcept
-{
-    string failure = FailureType() + ": " + FailureDesc();
-    return failure.c_str();
-}

src/PRadException.h

-#ifndef PRAD_EXCEPTION_H
-#define PRAD_EXCEPTION_H
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <exception>
-#include <string>
-#include <sstream>
-
-class PRadException : public std::exception
-{
-public:
-    enum PRadExceptionType
-    {
-        UNKNOWN_ERROR,
-        ET_CONNECT_ERROR,
-        ET_CONFIG_ERROR,
-        ET_STATION_CONFIG_ERROR,
-        ET_STATION_CREATE_ERROR,
-        ET_STATION_ATTACH_ERROR,
-        ET_READ_ERROR,
-        ET_PUT_ERROR,
-        HIGH_VOLTAGE_ERROR,
-    };
-    PRadException(const std::string &typ, const std::string &txt = "", const std::string &aux = "");
-    PRadException(PRadExceptionType typ = UNKNOWN_ERROR, const std::string &txt = "", const std::string &aux = "");
-    PRadException(PRadExceptionType typ, const std::string &txt, const std::string &file, const std::string &func, int line);
-    virtual ~PRadException(void) {}
-    virtual std::string FailureDesc(void) const;
-    virtual std::string FailureType(void) const;
-    const char *what() const noexcept;
-
-public:
-    PRadExceptionType type;             // exception type
-    std::string title;
-    std::string text;     // primary text
-    std::string auxText;  // auxiliary text
-};
-
-#endif
-
-

src/THcAerogel.cxx

@@ -39,7 +39,8 @@ THcAerogel::THcAerogel( const char* name, const char* description,
   THaNonTrackingDetector(name,description,apparatus),
   fPresentP(0),
   fAdcPosTimeWindowMin(0), fAdcPosTimeWindowMax(0), fAdcNegTimeWindowMin(0),
-  fAdcNegTimeWindowMax(0), fRegionValue(0), fPosGain(0), fNegGain(0),
+  fAdcNegTimeWindowMax(0),fPedNegDefault(0),fPedPosDefault(0),
+  fRegionValue(0), fPosGain(0), fNegGain(0),
   frPosAdcPedRaw(0), frPosAdcPulseIntRaw(0), frPosAdcPulseAmpRaw(0),
   frPosAdcPulseTimeRaw(0), frPosAdcPed(0), frPosAdcPulseInt(0),
   frPosAdcPulseAmp(0), frPosAdcPulseTime(0), frNegAdcPedRaw(0),
@@ -59,7 +60,8 @@ THcAerogel::THcAerogel( const char* name, const char* description,
 THcAerogel::THcAerogel( ) :
   THaNonTrackingDetector(),
   fAdcPosTimeWindowMin(0), fAdcPosTimeWindowMax(0), fAdcNegTimeWindowMin(0),
-  fAdcNegTimeWindowMax(0), fRegionValue(0), fPosGain(0), fNegGain(0),
+  fAdcNegTimeWindowMax(0), 
+  fPedNegDefault(0),fPedPosDefault(0),fRegionValue(0), fPosGain(0), fNegGain(0),
   frPosAdcPedRaw(0), frPosAdcPulseIntRaw(0), frPosAdcPulseAmpRaw(0),
   frPosAdcPulseTimeRaw(0), frPosAdcPed(0), frPosAdcPulseInt(0),
   frPosAdcPulseAmp(0), frPosAdcPulseTime(0), frNegAdcPedRaw(0),
@@ -111,6 +113,8 @@ void THcAerogel::DeleteArrays()
   delete [] fAdcPosTimeWindowMax; fAdcPosTimeWindowMax = 0;
   delete [] fAdcNegTimeWindowMin; fAdcNegTimeWindowMin = 0;
   delete [] fAdcNegTimeWindowMax; fAdcNegTimeWindowMax = 0;
+  delete [] fPedNegDefault; fPedNegDefault = 0;
+  delete [] fPedPosDefault; fPedPosDefault = 0;
 
   // 6 GeV variables
   delete fPosTDCHits; fPosTDCHits = NULL;
@@ -296,6 +300,8 @@ Int_t THcAerogel::ReadDatabase( const TDatime& date )
   fAdcPosTimeWindowMax = new Double_t [fNelem];
   fAdcNegTimeWindowMin = new Double_t [fNelem];
   fAdcNegTimeWindowMax = new Double_t [fNelem];
+  fPedNegDefault = new Int_t [fNelem];
+  fPedPosDefault = new Int_t [fNelem];
 
   DBRequest list[]={
     {"aero_num_regions",      &fNRegions,         kInt},
@@ -315,6 +321,8 @@ Int_t THcAerogel::ReadDatabase( const TDatime& date )
     {"aero_adcPosTimeWindowMax", fAdcPosTimeWindowMax, kDouble, static_cast<UInt_t>(fNelem), 1},
     {"aero_adcNegTimeWindowMin", fAdcNegTimeWindowMin, kDouble, static_cast<UInt_t>(fNelem), 1},
     {"aero_adcNegTimeWindowMax", fAdcNegTimeWindowMax, kDouble, static_cast<UInt_t>(fNelem), 1},
+    {"aero_PedNegDefault", fPedNegDefault, kInt, static_cast<UInt_t>(fNelem), 1},
+    {"aero_PedPosDefault", fPedPosDefault, kInt, static_cast<UInt_t>(fNelem), 1},
     {"aero_adc_tdc_offset",   &fAdcTdcOffset,     kDouble, 0, 1},
     {"aero_debug_adc",        &fDebugAdc,         kInt,    0, 1},
     {"aero_six_gev_data",     &fSixGevData,       kInt,    0, 1},
@@ -331,6 +339,8 @@ Int_t THcAerogel::ReadDatabase( const TDatime& date )
    fAdcNegTimeWindowMin[ip] = -1000.;
    fAdcPosTimeWindowMax[ip] = 1000.;
    fAdcNegTimeWindowMax[ip] = 1000.;
+   fPedNegDefault[ip] = 0.;
+   fPedPosDefault[ip] = 0.;
   }
 
   fSixGevData = 0; // Set 6 GeV data parameter to false unless set in parameter file
@@ -646,6 +656,21 @@ Int_t THcAerogel::Decode( const THaEvData& evdata )
 
       if (rawPosAdcHit.GetPulseAmpRaw(thit) > 0)  ((THcSignalHit*) fPosAdcErrorFlag->ConstructedAt(nrPosAdcHits))->Set(npmt, 0);
       if (rawPosAdcHit.GetPulseAmpRaw(thit) <= 0) ((THcSignalHit*) fPosAdcErrorFlag->ConstructedAt(nrPosAdcHits))->Set(npmt, 1);
+ 
+     if (rawPosAdcHit.GetPulseAmpRaw(thit) <= 0) {
+	Double_t PeakPedRatio= rawPosAdcHit.GetF250_PeakPedestalRatio();
+	Int_t NPedSamples= rawPosAdcHit.GetF250_NPedestalSamples();
+	Double_t AdcToC =  rawPosAdcHit.GetAdcTopC();
+	Double_t AdcToV =  rawPosAdcHit.GetAdcTomV();
+	if (fPedPosDefault[npmt-1] !=0) {
+	  Double_t tPulseInt = AdcToC*(rawPosAdcHit.GetPulseIntRaw(thit) - fPedPosDefault[npmt-1]*PeakPedRatio);
+	  ((THcSignalHit*) frPosAdcPulseInt->ConstructedAt(nrPosAdcHits))->Set(npmt, tPulseInt);
+          ((THcSignalHit*) frPosAdcPedRaw->ConstructedAt(nrPosAdcHits))->Set(npmt, fPedPosDefault[npmt-1]);
+          ((THcSignalHit*) frPosAdcPed->ConstructedAt(nrPosAdcHits))->Set(npmt, float(fPedPosDefault[npmt-1])/float(NPedSamples)*AdcToV);
+	  
+	}
+	((THcSignalHit*) frPosAdcPulseAmp->ConstructedAt(nrPosAdcHits))->Set(npmt, 0.);	
+      }
 
       ++nrPosAdcHits;
       fTotNumAdcHits++;
@@ -669,6 +694,21 @@ Int_t THcAerogel::Decode( const THaEvData& evdata )
       if (rawNegAdcHit.GetPulseAmpRaw(thit) > 0)  ((THcSignalHit*) fNegAdcErrorFlag->ConstructedAt(nrNegAdcHits))->Set(npmt, 0);
       if (rawNegAdcHit.GetPulseAmpRaw(thit) <= 0) ((THcSignalHit*) fNegAdcErrorFlag->ConstructedAt(nrNegAdcHits))->Set(npmt, 1);
 
+     if (rawNegAdcHit.GetPulseAmpRaw(thit) <= 0) {
+	Double_t PeakPedRatio= rawNegAdcHit.GetF250_PeakPedestalRatio();
+	Int_t NPedSamples= rawNegAdcHit.GetF250_NPedestalSamples();
+	Double_t AdcToC =  rawNegAdcHit.GetAdcTopC();
+	Double_t AdcToV =  rawNegAdcHit.GetAdcTomV();
+	if (fPedNegDefault[npmt-1] !=0) {
+	  Double_t tPulseInt = AdcToC*(rawNegAdcHit.GetPulseIntRaw(thit) - fPedNegDefault[npmt-1]*PeakPedRatio);
+	  ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(nrNegAdcHits))->Set(npmt, tPulseInt);
+          ((THcSignalHit*) frNegAdcPedRaw->ConstructedAt(nrNegAdcHits))->Set(npmt, fPedNegDefault[npmt-1]);
+          ((THcSignalHit*) frNegAdcPed->ConstructedAt(nrNegAdcHits))->Set(npmt, float(fPedNegDefault[npmt-1])/float(NPedSamples)*AdcToV);
+	  
+	}
+	((THcSignalHit*) frNegAdcPulseAmp->ConstructedAt(nrNegAdcHits))->Set(npmt, 0.);	
+      }
+
       ++nrNegAdcHits;
       fTotNumAdcHits++;
       fTotNumNegAdcHits++;
@@ -690,6 +730,8 @@ Int_t THcAerogel::CoarseProcess( TClonesArray&  ) //tracks
 {
   Double_t StartTime = 0.0;
   if( fglHod ) StartTime = fglHod->GetStartTime();
+   Double_t OffsetTime = 0.0;
+   if( fglHod ) OffsetTime = fglHod->GetOffsetTime();
   //cout << " starttime = " << StartTime << endl;
     // Loop over the elements in the TClonesArray
     for(Int_t ielem = 0; ielem < frPosAdcPulseInt->GetEntries(); ielem++) {
@@ -700,18 +742,13 @@ Int_t THcAerogel::CoarseProcess( TClonesArray&  ) //tracks
       Double_t pulseIntRaw  = ((THcSignalHit*) frPosAdcPulseIntRaw->ConstructedAt(ielem))->GetData();
       Double_t pulseAmp     = ((THcSignalHit*) frPosAdcPulseAmp->ConstructedAt(ielem))->GetData();
       Double_t pulseTime    = ((THcSignalHit*) frPosAdcPulseTime->ConstructedAt(ielem))->GetData();
-      Double_t adctdcdiffTime = StartTime-pulseTime;
-      Bool_t   errorFlag    = ((THcSignalHit*) fPosAdcErrorFlag->ConstructedAt(ielem))->GetData();
+      Double_t adctdcdiffTime = StartTime-pulseTime+OffsetTime;
       ////      Bool_t   pulseTimeCut = adctdcdiffTime > fAdcTimeWindowMin && adctdcdiffTime < fAdcTimeWindowMax;
       Bool_t   pulseTimeCut = adctdcdiffTime > fAdcPosTimeWindowMin[npmt] && adctdcdiffTime < fAdcPosTimeWindowMax[npmt];
 
       // By default, the last hit within the timing cut will be considered "good"
-     if (!errorFlag)
-      {
 	fGoodPosAdcMult.at(npmt) += 1;
-      }
-
-     if (!errorFlag && pulseTimeCut) {
+     if (pulseTimeCut) {
     	fGoodPosAdcPed.at(npmt)         = pulsePed;
  	//	cout << " out = " << npmt << " " <<   frPosAdcPulseInt->GetEntries() << " " <<fGoodPosAdcMult.at(npmt); 
     	fGoodPosAdcPulseInt.at(npmt)    = pulseInt;
@@ -738,17 +775,13 @@ Int_t THcAerogel::CoarseProcess( TClonesArray&  ) //tracks
       Double_t pulseIntRaw  = ((THcSignalHit*) frNegAdcPulseIntRaw->ConstructedAt(ielem))->GetData();
       Double_t pulseAmp     = ((THcSignalHit*) frNegAdcPulseAmp->ConstructedAt(ielem))->GetData();
       Double_t pulseTime    = ((THcSignalHit*) frNegAdcPulseTime->ConstructedAt(ielem))->GetData();
-      Double_t adctdcdiffTime = StartTime-pulseTime;
-      Bool_t   errorFlag    = ((THcSignalHit*) fNegAdcErrorFlag->ConstructedAt(ielem))->GetData();
+      Double_t adctdcdiffTime = StartTime-pulseTime+OffsetTime;
       ////      Bool_t   pulseTimeCut = adctdcdiffTime > fAdcTimeWindowMin && adctdcdiffTime < fAdcTimeWindowMax;
       Bool_t   pulseTimeCut = adctdcdiffTime > fAdcNegTimeWindowMin[npmt] && adctdcdiffTime < fAdcNegTimeWindowMax[npmt];
-      if (!errorFlag)
-      {
 	fGoodNegAdcMult.at(npmt) += 1;
-      }
  
       // By default, the last hit within the timing cut will be considered "good"
-      if (!errorFlag && pulseTimeCut) {
+      if (pulseTimeCut) {
     	fGoodNegAdcPed.at(npmt)         = pulsePed;
     	fGoodNegAdcPulseIntRaw.at(npmt) = pulseIntRaw;
     	fGoodNegAdcPulseAmp.at(npmt)    = pulseAmp;

src/THcAerogel.h

@@ -73,6 +73,8 @@ class THcAerogel : public THaNonTrackingDetector, public THcHitList {
   Double_t  *fAdcPosTimeWindowMax;
   Double_t  *fAdcNegTimeWindowMin;
   Double_t  *fAdcNegTimeWindowMax;
+  Int_t*  fPedNegDefault;
+  Int_t*  fPedPosDefault;
 
   Double_t  fAdcTdcOffset;
   Double_t  *fRegionValue;

src/THcCherenkov.h

@@ -69,6 +69,7 @@ public:
   Int_t     fTotNumGoodAdcHits;
   Int_t     fTotNumTracksMatched;
   Int_t     fTotNumTracksFired;
+  Double_t  fRefTime;
   Double_t  fNpeSum;
   Double_t* fGain;
 
@@ -102,6 +103,7 @@ public:
   Double_t  fNpeThresh;
   Double_t*  fAdcTimeWindowMin;
   Double_t*  fAdcTimeWindowMax;
+  Int_t*  fPedDefault;
   Double_t  fAdcTdcOffset;
   Double_t* fRegionValue;
 

src/THcCoinTime.cxx

@@ -65,6 +65,14 @@ void THcCoinTime::Clear( Option_t* opt )
   fROC2_ePosCoinTime=kBig;
   fROC1_RAW_CoinTime=kBig;
   fROC2_RAW_CoinTime=kBig;
+  fTRIG1_ePosCoinTime=kBig;
+  fTRIG4_ePosCoinTime=kBig;
+  fTRIG1_ePiCoinTime=kBig;
+  fTRIG4_ePiCoinTime=kBig;
+  fTRIG1_eKCoinTime=kBig;
+  fTRIG4_eKCoinTime=kBig;
+  fTRIG1_epCoinTime=kBig;
+  fTRIG4_epCoinTime=kBig;
 }
 
 //_____________________________________________________________________________
@@ -263,6 +271,9 @@ Int_t THcCoinTime::Process( const THaEvData& evdata )
       Double_t hms_ypfp = theHMSTrack->GetPhi();        
       Double_t HMS_FPtime = theHMSTrack->GetFPTime();    
       
+      if (SHMS_FPtime==-2000 || HMS_FPtime==-2000)  return 1;
+      if (SHMS_FPtime==-1000 || HMS_FPtime==-1000)  return 1;
+      
       //Get raw TDC Times for HMS/SHMS (3/4 trigger)
       pTRIG1_TdcTime_ROC1 = fCoinDet->Get_CT_Trigtime(0);  //SHMS
       pTRIG4_TdcTime_ROC1 = fCoinDet->Get_CT_Trigtime(1);  //HMS

src/THcDC.h

@@ -227,7 +227,7 @@ protected:
 
 public:
   THcDriftChamberPlane* GetPlane(unsigned int i_plane) {
-    if(i_plane < fNPlanes) {
+    if(static_cast<int>(i_plane) < fNPlanes) {
       return fPlanes[i_plane];
     }
     return nullptr;

src/THcDriftChamberPlane.cxx

@@ -298,6 +298,7 @@ Int_t THcDriftChamberPlane::DefineVariables( EMode mode )
     {"dist","Drift distancess",
      "fHits.THcDCHit.GetDist()"},
     {"nhit", "Number of hits", "GetNHits()"},
+    {"RefTime", "TDC reference time", "fTdcRefTime"},
     { 0 }
   };
 
@@ -351,7 +352,7 @@ Int_t THcDriftChamberPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
 
   fHits->Clear();
   fRawHits->Clear();
-
+  fTdcRefTime = kBig;
   Int_t nrawhits = rawhits->GetLast()+1;
   fNRawhits=0;
   Int_t ihit = nexthit;
@@ -365,6 +366,7 @@ Int_t THcDriftChamberPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
     Int_t wireNum = hit->fCounter;
     THcDCWire* wire = GetWire(wireNum);
     Bool_t First_Hit_In_Window = kTRUE;
+    if (hit->GetRawTdcHit().HasRefTime()) fTdcRefTime = hit->GetRawTdcHit().GetRefTime();
     for(UInt_t mhit=0; mhit<hit->GetRawTdcHit().GetNHits(); mhit++) {
       fNRawhits++;
       /* Sort into early, late and ontime */
@@ -391,6 +393,7 @@ Int_t THcDriftChamberPlane::SubtractStartTime()
 {
   Double_t StartTime = 0.0;
   if( fglHod ) StartTime = fglHod->GetStartTime();
+  if (StartTime == -1000) StartTime = 0.0;
   for(Int_t ihit=0;ihit<GetNHits();ihit++) { 
     THcDCHit *thishit = (THcDCHit*) fHits->At(ihit);
     Double_t temptime= thishit->GetTime()-StartTime;

src/THcDriftChamberPlane.h

@@ -86,6 +86,8 @@ protected:
   TClonesArray* fHits;
   TClonesArray* fRawHits;
   TClonesArray* fWires;
+ 
+  Double_t fTdcRefTime;
 
   Int_t fVersion;
   Int_t fWireOrder;

src/THcHallCSpectrometer.cxx

@@ -142,6 +142,10 @@ Int_t THcHallCSpectrometer::DefineVariables( EMode mode )
   fIsSetup = ( mode == kDefine );
   RVarDef vars[] = {
     { "tr.betachisq", "Chi2 of beta", "fTracks.THaTrack.GetBetaChi2()"},
+    { "tr.GoodPlane4", "Flag for track hitting hodo plane 4", "fTracks.THaTrack.GetGoodPlane4()"},
+    { "tr.GoodPlane3", "Flag for track hitting hodo plane 3", "fTracks.THaTrack.GetGoodPlane3()"},
+    { "tr.fptime", "Track hodo focal plane time", "fTracks.THaTrack.GetFPTime()"},
+    { "tr.npmt", "Track number of hodo PMTs hit", "fTracks.THaTrack.GetNPMT()"},
     { "tr.PruneSelect", "Prune Select ID", "fPruneSelect"},
     { "present", "Trigger Type includes this spectrometer", "fPresent"},
     { 0 }

src/THcHelicityReader.h

@@ -10,60 +10,59 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "Rtypes.h"
+#include "THaHelicityDet.h"
+#include "hcana/Logger.h"
 
 class THaEvData;
 class TDatime;
 class TH1F;
 
-class THcHelicityReader {
-  
+class THcHelicityReader : public hcana::ConfigLogging<podd2::EmptyBase> {
+
 public:
   THcHelicityReader();
   virtual ~THcHelicityReader();
-  
+
   struct ROCinfo {
-    Int_t  roc;               // ROC to read out
-    Int_t  slot;            // Headers to search for (0 = ignore)
-    Int_t  index;             // Index into buffer
+    Int_t roc;   // ROC to read out
+    Int_t slot;  // Headers to search for (0 = ignore)
+    Int_t index; // Index into buffer
   };
-  
-protected:
 
+protected:
   // Used by ReadDatabase
   enum EROC { kHel = 0, kHelm, kMPS, kQrt, kTime, kCount };
-  Int_t SetROCinfo( EROC which, Int_t roc, Int_t slot, Int_t index );
+  Int_t SetROCinfo(EROC which, Int_t roc, Int_t slot, Int_t index);
 
-  virtual void  Clear( Option_t* opt="" );
-  virtual Int_t ReadData( const THaEvData& evdata );
-  Int_t         ReadDatabase( const char* dbfilename, const char* prefix,
-			      const TDatime& date, int debug_flag = 0 );
-  void Begin();
-  void End();
+  virtual void  Clear(Option_t* opt = "");
+  virtual Int_t ReadData(const THaEvData& evdata);
+  Int_t         ReadDatabase(const char* dbfilename, const char* prefix, const TDatime& date,
+                             int debug_flag = 0);
+  void          Begin();
+  void          End();
 
   ULong64_t fTITime;
-  UInt_t fTITime_last;
-  UInt_t fTITime_rollovers;
-  
+  UInt_t    fTITime_last;
+  UInt_t    fTITime_rollovers;
+
   // Reported Helicity status for the event
   Bool_t fIsMPS;
   Bool_t fIsQrt;
   Bool_t fIsHelp;
   Bool_t fIsHelm;
 
-  Int_t fADCThreshold;		// Threshold for On/Off of helicity signals
+  Int_t fADCThreshold; // Threshold for On/Off of helicity signals
 
-  ROCinfo  fROCinfo[kCount];
+  ROCinfo fROCinfo[kCount];
 
-  Int_t    fQWEAKDebug;          // Debug level
-  Bool_t   fHaveROCs;         // Required ROCs are defined
-  Bool_t   fNegGate;          // Invert polarity of gate, TO DO implement this functionality
+  Int_t              fQWEAKDebug; // Debug level
+  Bool_t             fHaveROCs;   // Required ROCs are defined
+  Bool_t             fNegGate;    // Invert polarity of gate, TO DO implement this functionality
   static const Int_t NHISTR = 12;
   //  TH1F*    fHistoR[12];  // Histograms
 
 private:
-
-  ClassDef(THcHelicityReader,0) // Helper class for reading QWEAK helicity data
-
+  ClassDef(THcHelicityReader, 0) // Helper class for reading QWEAK helicity data
 };
 
 #endif

src/THcHitList.h

@@ -73,6 +73,7 @@ protected:
     Int_t slot;
     Int_t channel;
     Int_t reftime;
+    Int_t refdifftime;
   };
   std::vector<RefIndexMap> fRefIndexMaps;
   // Should this be a sparse list instead in case user

src/THcHodoHit.h

@@ -34,6 +34,9 @@ public:
   Double_t GetNegADCpeak() const { return fNegADC_Peak; }
   Double_t GetPosADCtime() const { return fPosADC_Time; }
   Double_t GetNegADCtime() const { return fNegADC_Time; }
+  Double_t GetPosADCCorrtime() const { return fPosADC_CorrTime; }
+  Double_t GetNegADCCorrtime() const { return fNegADC_CorrTime; }
+  Double_t GetCalcPosition() const { return fCalcPosition; }
   Int_t GetPosTDC() const { return fPosTDC; }
   Int_t GetNegTDC() const { return fNegTDC; }
   Double_t GetPosCorrectedTime() const { return fPosCorrectedTime;}
@@ -46,8 +49,9 @@ public:
   Int_t GetPaddleNumber() const { return fPaddleNumber; }
   Double_t GetPaddleCenter() const { return fPaddleCenter; }
 
-  void SetCorrectedTimes(Double_t pos, Double_t neg, Double_t) {
+  void SetCorrectedTimes(Double_t pos, Double_t neg) {
     fPosCorrectedTime = pos; fNegCorrectedTime = neg;
+    fHasCorrectedTimes = kFALSE;
   }
   void SetCorrectedTimes(Double_t pos, Double_t neg,
 			 Double_t postof, Double_t negtof,
@@ -75,6 +79,15 @@ public:
   void  SetNegADCtime( Double_t ptime) {
       fNegADC_Time =ptime;
  }
+  void  SetPosADCCorrtime( Double_t ptime) {
+      fPosADC_CorrTime =ptime;
+ }
+  void  SetNegADCCorrtime( Double_t ptime) {
+      fNegADC_CorrTime =ptime;
+ }
+  void  SetCalcPosition( Double_t calcpos) {
+      fCalcPosition =calcpos;
+ }
 protected:
   static const Double_t kBig;  //!
 
@@ -86,6 +99,9 @@ protected:
   Double_t fNegADC_Peak;		// ADC peak amplitude
   Double_t fPosADC_Time;		// ADC time
   Double_t fNegADC_Time;		// ADC time
+  Double_t fPosADC_CorrTime;		// ADC time
+  Double_t fNegADC_CorrTime;		// ADC time
+  Double_t fCalcPosition;		// Position along paddle calculated by time diff
   Int_t fPaddleNumber;
 
   Double_t fPosCorrectedTime;	// Pulse height corrected time