Changeset 12038 for trunk/FACT++

Timestamp:

09/08/11 21:44:32 (14 years ago)

Author:

tbretz

Message:

Fixed the check for the sampling-frequency check.

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (1 diff)

trunk/FACT++/src/ftmctrl.cc

@@ -2275 +2275 @@
             }
 
-            FTM::StaticData data;
-
-            const uint16_t frq = conf.GetDef<uint16_t>("sampling-frequency.", *it);
-            if (fClockCondSetup.count(frq)==0)
+            if (!conf.HasDef("sampling-frequency.", *it))
             {
-                T::Error("sampling-frequency."+*it+" - frequency not available.");
+                T::Error("Neither sampling-frequency."+*it+" nor sampling-frequency.default found.");
                 return 2;
             }
 
+            const uint16_t frq = conf.GetDef<uint16_t>("sampling-frequency.", *it);
+
+            FTM::StaticData data;
             data.SetClockRegister(fClockCondSetup[frq].data());