Crash if requested configuration not viable

Author: ddobrigk

PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx

@@ -1173,6 +1173,10 @@ struct strangenesstofpid {
 
     LOGF(info, "Processing derived data. Is this the new TOF info format? %i", isNewTOFFormat);
 
+    if(!isNewTOFFormat && calculationMethod.value > 0){ 
+      LOGF(fatal, "Using the old derived data format with the new calculation method is not viable due to lack of needed info! Crashing.");
+    }
+
     // Fire up CCDB with first collision in record. If no collisions, bypass
     if (useCustomRunNumber || collisions.size() < 1) {
       initCCDB(manualRunNumber);
@@ -1209,7 +1213,7 @@ struct strangenesstofpid {
         pTof.tpcNSigmaPr = pTra.tpcNSigmaPr();
         if (tofIndices[V0.posTrackExtraId()] >= 0 && collision.eventTime() > -1e+5) {
           auto pTofExt = dauTrackTOFPIDs.rawIteratorAt(tofIndices[V0.posTrackExtraId()]);
-          pTof.collisionId = isNewTOFFormat ? pTofExt.straCollisionId() : V0.straCollisionId();
+          pTof.collisionId = pTofExt.straCollisionId();
           pTof.tofExpMom = pTofExt.tofExpMom();
           pTof.tofEvTime = collision.eventTime();
           pTof.tofSignal = pTofExt.tofSignal();
@@ -1223,7 +1227,7 @@ struct strangenesstofpid {
         nTof.tpcNSigmaPr = nTra.tpcNSigmaPr();
         if (tofIndices[V0.negTrackExtraId()] >= 0 && collision.eventTime() > -1e+5) {
           auto nTofExt = dauTrackTOFPIDs.rawIteratorAt(tofIndices[V0.negTrackExtraId()]);
-          nTof.collisionId = isNewTOFFormat ? nTofExt.straCollisionId() : V0.straCollisionId();
+          nTof.collisionId = nTofExt.straCollisionId();
           nTof.tofExpMom = nTofExt.tofExpMom();
           nTof.tofEvTime = collision.eventTime();
           nTof.tofSignal = nTofExt.tofSignal();
@@ -1257,7 +1261,7 @@ struct strangenesstofpid {
         pTof.tpcNSigmaPr = pTra.tpcNSigmaPr();
         if (tofIndices[cascade.posTrackExtraId()] >= 0 && collision.eventTime() > -1e+5) {
           auto pTofExt = dauTrackTOFPIDs.rawIteratorAt(tofIndices[cascade.posTrackExtraId()]);
-          pTof.collisionId = isNewTOFFormat ? pTofExt.straCollisionId() : cascade.straCollisionId();
+          pTof.collisionId = pTofExt.straCollisionId();
           pTof.tofExpMom = pTofExt.tofExpMom();
           pTof.tofEvTime = collision.eventTime();
           pTof.tofSignal = pTofExt.tofSignal();
@@ -1271,7 +1275,7 @@ struct strangenesstofpid {
         nTof.tpcNSigmaPr = nTra.tpcNSigmaPr();
         if (tofIndices[cascade.negTrackExtraId()] >= 0 && collision.eventTime() > -1e+5) {
           auto nTofExt = dauTrackTOFPIDs.rawIteratorAt(tofIndices[cascade.negTrackExtraId()]);
-          nTof.collisionId = isNewTOFFormat ? nTofExt.straCollisionId() : cascade.straCollisionId();
+          nTof.collisionId = nTofExt.straCollisionId();
           nTof.tofExpMom = nTofExt.tofExpMom();
           nTof.tofEvTime = collision.eventTime();
           nTof.tofSignal = nTofExt.tofSignal();
@@ -1285,7 +1289,7 @@ struct strangenesstofpid {
         bTof.tpcNSigmaKa = bTra.tpcNSigmaKa();
         if (tofIndices[cascade.bachTrackExtraId()] >= 0 && collision.eventTime() > -1e+5) {
           auto bTofExt = dauTrackTOFPIDs.rawIteratorAt(tofIndices[cascade.bachTrackExtraId()]);
-          bTof.collisionId = isNewTOFFormat ? bTofExt.straCollisionId() : cascade.straCollisionId();
+          bTof.collisionId = bTofExt.straCollisionId();
           bTof.tofExpMom = bTofExt.tofExpMom();
           bTof.tofEvTime = collision.eventTime();
           bTof.tofSignal = bTofExt.tofSignal();