Changeset 14683 for trunk/FACT++

Timestamp:

11/22/12 09:23:58 (12 years ago)

Author:

tbretz

Message:

Took out automatic crate reset for the moment. That is something which needs to be done once at the beginning of data-taking.

File:

• trunk/FACT++/src/mcp.cc (modified) (7 diffs)

trunk/FACT++/src/mcp.cc

@@ -343 +343 @@
         if (GetCurrentState()==MCP::State::kConfiguring3)
         {
+            /*
             // If everything is configured but the FADs
             // we run into a timeout and some FAD need to be reset
@@ -348 +349 @@
             if (fDimFTM.state() == FTM::State::kConfigured &&
                 fDimFAD.state() != FAD::State::kConfigured &&
-                /*fDimRC.state()  >  RateControl::State::kSettingGlobalThreshold &&*/
+                //fDimRC.state()  >  RateControl::State::kSettingGlobalThreshold &&
                 fFadTimeout+boost::posix_time::seconds(15)<Time() &&
                 count(fFadNeedsReset.begin(), fFadNeedsReset.end(), true)>0)
@@ -355 +356 @@
                 return MCP::State::kCrateReset0;
             }
-
+            */
             // If something is not yet properly configured: keep state
             if (fDimFTM.state() != FTM::State::kConfigured ||
@@ -410 +411 @@
 
         // ========================================================
-
+        /*
         if (GetCurrentState()==MCP::State::kCrateReset0)
         {
@@ -486 +487 @@
             return MCP::State::kConfiguring1;
         }
-
+        */
         // ========================================================
 
@@ -545 +546 @@
         AddStateName(MCP::State::kConfiguring3, "Configuring3",
                      "Waiting for FADs and rate control to get ready");
-
+        /*
         AddStateName(MCP::State::kCrateReset0, "CrateReset0",
                      "Disabling FTUs, disconnecting FADs");
@@ -554 +555 @@
         AddStateName(MCP::State::kCrateReset3, "CrateReset3",
                      "Waiting for FTUs to be enabled and for FADs to be re-connected");
-
+        */
         AddStateName(MCP::State::kConfigured, "Configured",
                      "Everything is configured, trigger will be switched on now");