From 4b630ae425ba914e6ece938969092296d216c8a1 Mon Sep 17 00:00:00 2001
From: Gene Van Buren <gene@bnl.gov>
Date: Tue, 28 Jan 2025 14:30:17 -0500
Subject: [PATCH 1/2] Modify genDst.C to allow use of FXT DB flavors

---
 StRoot/macros/mudst/genDst.C | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/StRoot/macros/mudst/genDst.C b/StRoot/macros/mudst/genDst.C
index e237e1c48c5..0c1570ead92 100644
--- a/StRoot/macros/mudst/genDst.C
+++ b/StRoot/macros/mudst/genDst.C
@@ -198,6 +198,10 @@ void genDst(unsigned int First,
   // Determine database flavors
   TString flavors = "ofl"; // default flavor for offline
 
+  // FXT flavor
+  if (findAndRemoveOption("FXT",optionTokens))
+    flavors.Prepend("FXT+");
+
   // simulation flavors
   if (findAndRemoveOption("Simu",optionTokens) && ! findAndRemoveOption("NoSimuDb",optionTokens))
     flavors.Prepend("sim+");

From 0130872bb90025dc1124aba2e2e9b26363dca3a5 Mon Sep 17 00:00:00 2001
From: Gene Van Buren <gene@bnl.gov>
Date: Thu, 13 Feb 2025 10:17:03 -0500
Subject: [PATCH 2/2] Match behavior of FXT option from bfc.C

---
 StRoot/macros/mudst/genDst.C | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/StRoot/macros/mudst/genDst.C b/StRoot/macros/mudst/genDst.C
index 0c1570ead92..8920923f960 100644
--- a/StRoot/macros/mudst/genDst.C
+++ b/StRoot/macros/mudst/genDst.C
@@ -144,19 +144,26 @@ void procGeoTag(TObjArray* optionTokens)
   }
 }
 
-bool findAndRemoveOption(const char* optionName, TObjArray* optionTokens)
+bool findAndRemoveOption(const char* optionName, TObjArray* optionTokens, bool doRemove=true)
 {
   TString optName = optionName;
   optName.ToLower();
   TObject* obj = optionTokens->FindObject(optName.Data());
   if (obj) {
-    optionTokens->Remove(obj);
-    optionTokens->Compress();
+    if (doRemove) {
+      optionTokens->Remove(obj);
+      optionTokens->Compress();
+    }
     return true;
   }
   return false;
 }
 
+bool findOption(const char* optionName, TObjArray* optionTokens)
+{
+   return findAndRemoveOption(optionName,optionTokens,false);
+}
+
 void genDst(unsigned int First,
             unsigned int Last,
             const char* options,
@@ -199,7 +206,7 @@ void genDst(unsigned int First,
   TString flavors = "ofl"; // default flavor for offline
 
   // FXT flavor
-  if (findAndRemoveOption("FXT",optionTokens))
+  if (findOption("FXT",optionTokens))
     flavors.Prepend("FXT+");
 
   // simulation flavors
@@ -277,6 +284,10 @@ void genDst(unsigned int First,
         vpdCalib->setUseVpdStart(kFALSE);
       }
 
+      if (findOption("FXT",optionTokens)) {
+        btofCalib->SetAttr("btofFXT", 1);
+      }
+
     }
 
     if (findAndRemoveOption("etofmatch",optionTokens)) {