From f10dfcb1bd25b0bcadcea283572b365174403dbe Mon Sep 17 00:00:00 2001
From: Michael Hank <mhank@login02.af.uchicago.edu>
Date: Thu, 25 Apr 2024 11:34:17 -0500
Subject: [PATCH] Fixing Run3 FTAG MCMC SF behavior after looking at CDI files

---
 Root/BJetEfficiencyCorrector.cxx | 86 +++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 36 deletions(-)

diff --git a/Root/BJetEfficiencyCorrector.cxx b/Root/BJetEfficiencyCorrector.cxx
index b421c7e1d..6fe36793f 100644
--- a/Root/BJetEfficiencyCorrector.cxx
+++ b/Root/BJetEfficiencyCorrector.cxx
@@ -226,44 +226,58 @@ EL::StatusCode BJetEfficiencyCorrector :: initialize ()
 		gridName=wk()->metaData()->castString(SH::MetaFields::sampleName);
 		sampleShowerType=HelperFunctions::getMCShowerType(gridName);
 	      }
-
-	    switch(sampleShowerType)
-	      {
-	      case HelperFunctions::Pythia8:
-		calibration="410470";
+        
         if(m_isRun3){
-            calibration="601129";
+            switch(sampleShowerType)
+            {
+                case HelperFunctions::Pythia8:
+                    calibration="601229";
+                    break;
+                case HelperFunctions::Herwig7p2:
+                    calibration="601414";
+                    break;
+                case HelperFunctions::Sherpa2212:
+                    calibration="700660";
+                    break;
+                default:
+                    ANA_MSG_ERROR("Cannot determine MC shower type for sample " << gridName << ".");
+                    return EL::StatusCode::FAILURE;
+                    break;
+            }
+        } else {
+
+	        switch(sampleShowerType)
+	        {
+	            case HelperFunctions::Pythia8:
+		            calibration="410470";
+		            break;
+	            case HelperFunctions::Herwig7p1:
+		            calibration="411233";
+                    break; 
+                case HelperFunctions::Herwig7p2:
+                    calibration="600666";
+		            break;
+	            case HelperFunctions::Sherpa221:
+		            calibration="410250";
+		            break;
+	            case HelperFunctions::Sherpa2210:
+		            calibration="700122";
+		            break;
+                case HelperFunctions::Sherpa2212:
+                    calibration="700660";
+                    break;
+                case HelperFunctions::AmcPy8:
+                    calibration="410464";
+                    break;
+                case HelperFunctions::AmcH7:
+                    calibration="412116";
+                    break;
+	            case HelperFunctions::Unknown:
+		            ANA_MSG_ERROR("Cannot determine MC shower type for sample " << gridName << ".");
+		            return EL::StatusCode::FAILURE;
+		            break;
+	        }
         }
-		break;
-	      case HelperFunctions::Herwig7p1:
-		calibration="411233";
-        break; 
-          case HelperFunctions::Herwig7p2:
-        calibration="600666";
-        if(m_isRun3){
-            calibration="601414";
-        }
-		break;
-	      case HelperFunctions::Sherpa221:
-		calibration="410250";
-		break;
-	      case HelperFunctions::Sherpa2210:
-		calibration="700122";
-		break;
-          case HelperFunctions::Sherpa2212:
-        calibration="700660";
-        break;
-          case HelperFunctions::AmcPy8:
-        calibration="410464";
-        break;
-          case HelperFunctions::AmcH7:
-        calibration="412116";
-        break;
-	      case HelperFunctions::Unknown:
-		ANA_MSG_ERROR("Cannot determine MC shower type for sample " << gridName << ".");
-		return EL::StatusCode::FAILURE;
-		break;
-	      }
 	  } else { makeMCIndexMap(m_EfficiencyCalibration); }
 	ANA_CHECK( m_BJetEffSFTool_handle.setProperty("EfficiencyBCalibrations"    ,  calibration));
 	ANA_CHECK( m_BJetEffSFTool_handle.setProperty("EfficiencyCCalibrations"    ,  calibration));