Merged in upstream changed to THelicity

src/THcHelicity.cxx

@@ -285,7 +285,7 @@ Int_t THcHelicity::Decode(const THaEvData& evdata) {
             for (nbehind = 0; nbehind < 4; nbehind++) {
               if (seedscan == fRingSeed_reported) {
                 if (nbehind > 1) {
-                  _logger->warn("Scaler seed behind {} quartets", nbehind);
+                  cout << "Scaler seed behind " << nbehind << " quartets" << endl;
                   cout << "Ev seed     " << bitset<32>(fRingSeed_reported) << endl;
                   cout << "Scaler Seed " << bitset<32>(fScalerSeed) << endl;
                 }
@@ -294,7 +294,7 @@ Int_t THcHelicity::Decode(const THaEvData& evdata) {
               seedscan = RanBit30(seedscan);
             }
             if (nbehind > 4) {
-              _logger->warn("Scaler seed does not match");
+              cout << "Scaler seed does not match" << endl;
               cout << "Ev seed     " << bitset<32>(fRingSeed_reported) << endl;
               cout << "Scaler Seed " << bitset<32>(fScalerSeed) << endl;
             }
@@ -623,12 +623,14 @@ void THcHelicity::LoadHelicity(Int_t reportedhelicity, Int_t cyclecount, Int_t m
           cout << "Scaler Seed " << bitset<32>(fScalerSeed) << endl;
         }
         Int_t backseed = GetSeed30(fRingSeed_reported);
-        _logger->info("Seed at cycle {} should be {x}", fFirstCycle, backseed);
+        cout << "Seed at cycle " << fFirstCycle << " should be " << hex << backseed << dec << endl;
         // Create the "actual seed"
         fRingSeed_actual = fRingSeed_reported;
         for (Int_t i = 0; i < fHelDelay / 4; i++) {
           fRingSeed_actual = RanBit30(fRingSeed_actual);
         }
+        fQuartetStartHelicity          = (fRingSeed_actual & 1) ? kPlus : kMinus;
+        fQuartetStartPredictedHelicity = (fRingSeed_reported & 1) ? kPlus : kMinus;
       }
       fActualHelicity = kUnknown;
     } // Need to change this to build seed even when not at start of quartet