Changeset 20071 for trunk/FACT++/src

Timestamp:

04/12/21 18:49:01 (4 years ago)

Author:

tbretz

Message:

Allow for different names in fact and famous.

File:

• trunk/FACT++/src/fpgaftmctrl.cc (modified) (6 diffs)

trunk/FACT++/src/fpgaftmctrl.cc

@@ -36 +36 @@
 class ConnectionFPGAFTM : public Connection
 {
+public:
+    static bool fIsFACT;
+
 private:
     bool fIsVerbose;
@@ -674 +677 @@
 };
 
+bool ConnectionFPGAFTM::fIsFACT = true;
+
 // ------------------------------------------------------------------------
 
@@ -687 +692 @@
     ConnectionDimFPGAFTM(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionFPGAFTM(ioservice, imp),
-        fDimConfig("FTM_CONTROL/CONFIGURATION",
+        fDimConfig(fIsFACT?"FPGAFTM_CONTROL/CONFIGURATION":"FTM_CONTROL/CONFIGURATION",
                    "X:1;X:1;C:1;X:1;D:1;C:1;X:1;D:1;C:1;C:1;C:1;S:1;S:1;S:1;I:1;I:1;C:1;S:1",
                    "|firmware[uint64]:Firmware ID"
@@ -707 +712 @@
                    "|trg_inhibit_state[uint8]:"
                    "|trg_inhibit_time[5ns]:"),
-        fDimData("FTM_CONTROL/DATA", "I:1;I:1;I:1;I:1;I:1;S:1;F:1",
+        fDimData(fIsFACT?"FPGAFTM_CONTROL/DATA":"FTM_CONTROL/DATA", "I:1;I:1;I:1;I:1;I:1;S:1;F:1",
                  "|run_time[10ns]:Absolute Run Time"
                  "|dead_time[10ns]:Measured Dead Time"
@@ -1087 +1092 @@
 public:
     StateMachineFPGAFTM(ostream &out=cout) :
-        StateMachineAsio<T>(out, "FTM_CONTROL"), fFTM(*this, *this)
+        StateMachineAsio<T>(out, ConnectionFPGAFTM::fIsFACT?"FPGAFTM_CONTROL":"FTM_CONTROL"),
+        fFTM(*this, *this)
     {
         // State names
@@ -1511 +1517 @@
 int RunShell(Configuration &conf)
 {
+#if BOOST_VERSION < 104600
+    const string fname = boost::filesystem::path(conf.GetName()).filename();
+#else
+    const string fname = boost::filesystem::path(conf.GetName()).filename().string();
+#endif
+
+    ConnectionFPGAFTM::fIsFACT = fname!="ftmctrl";
     return Main::execute<T, StateMachineFPGAFTM<S, R>>(conf);
 }