Changeset 11498

Timestamp:

07/20/11 20:20:31 (13 years ago)

Author:

tbretz

Message:

Propagate the maximum number of events and the maximum run-type together with the run-type when configuring/starting a run.

Location:

trunk/FACT++/src

Files:

• fadctrl.cc (modified) (3 diffs)
• mcp.cc (modified) (4 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1066 +1066 @@
     int StartConfigure(const EventImp &evt)
     {
-        const string name = evt.GetText();
+        const string name = evt.Ptr<char>(16);
 
         fTargetConfig = fConfigs.find(name);
@@ -1075 +1075 @@
         }
 
-        const uint32_t runno = StartNewRun();
+        const uint32_t runno = StartNewRun(evt.Get<uint64_t>(), evt.Get<uint64_t>(8));
 
         ostringstream str;
@@ -1616 +1616 @@
             "|val[short]:Value to be set");
 
-        T::AddEvent("CONFIGURE", "C", FAD::kConnected, FAD::kConfigured)
+        T::AddEvent("CONFIGURE", "X:2;C", FAD::kConnected, FAD::kConfigured)
             (bind(&StateMachineFAD::StartConfigure, this, placeholders::_1))
             ("");

trunk/FACT++/src/mcp.cc

@@ -211 +211 @@
     }
 
-    string fRunType;
+    uint64_t fMaxTime;
+    uint64_t fNumEvents;
+    string   fRunType;
 
     int StartRun(const EventImp &evt)
     {
-        Message("Starting configuration '"+evt.GetString()+"' for new run.");
-        fRunType = evt.GetString();
+        fMaxTime   = evt.Get<int64_t>();
+        fNumEvents = evt.Get<int64_t>(8);
+        fRunType   = evt.Ptr<char>(16);
+
+        ostringstream str;
+        str << "Starting configuration '" << fRunType << "' for new run";
+        if (fNumEvents>0 || fMaxTime>0)
+            str << " [";
+            str << fNumEvents << " events"
+        if (fNumEvents>0 && fMaxTime>0)
+            str << " / ";
+        if (fMaxTime>0)
+            str << fMaxTime << "s";
+        if (fNumEvents>0 || fMaxTime>0)
+            str << "]";
+        Message(str);
+
         return kStateConfiguring1;
+    }
+
+    void ConfigureFAD()
+    {
+        struct Value
+        {
+            uint64_t time;
+            uint64_t nevts;
+            char type[];
+        };
+
+        const size_t len = sizeof(Value)+fRunType.length()+1;
+
+        char *buf = new char[len];
+
+        Value *val = reinterpret_cast<Value*>(buf);
+
+        val->time  = fMaxTime;
+        val->nevts = fNumEvents;
+
+        strcpy(val->type, fRunType.c_str());
+
+        Dim::SendCommand("FAD_CONTROL/CONFIGURE", buf, len);
+
+        delete buf;
     }
 
@@ -251 +293 @@
                     return GetCurrentState();
 
-                Dim::SendCommand("FAD_CONTROL/CONFIGURE", fRunType);
+                Message("Starting FAD");
+                ConfigureFAD();
                 return kStateConfiguring3;
             }
@@ -261 +304 @@
                     return GetCurrentState();
 
-                Message("START DATA TAKING");
-                Fatal("Distribute run-number to start datalogger!");
-                //Fatal("Must configure if FTM should be started or not?");
+                Message("Starting Trigger (FTM)");
                 Dim::SendCommand("FTM_CONTROL/START_RUN");
                 return kStateConfigured;
@@ -343 +384 @@
 
 
-        AddEvent("START", "C", kStateIdle)
+        AddEvent("START", "X:2;C")//, kStateIdle)
             (bind(&StateMachineMCP::StartRun, this, placeholders::_1))
             ("");