Changeset 11176

Timestamp:

06/24/11 14:36:41 (14 years ago)

Author:

tbretz

Message:

Added output of frequency calculated from the clock conditioner values.

Location:

trunk/FACT++

Files:

• gui/FactGui.h (modified) (1 diff)
• gui/design.ui (modified) (4 diffs)
• src/HeadersFTM.h (modified) (1 diff)

trunk/FACT++/gui/FactGui.h

@@ -1513 +1513 @@
         fClockCondR14->setValue(sdata.fClockConditioner[6]);
         fClockCondR15->setValue(sdata.fClockConditioner[7]);
+
+        const uint32_t R0  = sdata.fClockConditioner[0];
+        const uint32_t R14 = sdata.fClockConditioner[6];
+        const uint32_t R15 = sdata.fClockConditioner[7];
+
+        const uint32_t Ndiv = (R15&0x1ffff00)<<2;
+        const uint32_t Rdiv = (R14&0x007ff00)>>8;
+        const uint32_t Cdiv = (R0 &0x000ff00)>>8;
+
+        double freq = 40.*Ndiv/(Rdiv*Cdiv);
+
+        fClockCondFreqRes->setValue(freq);
 
         //fClockCondFreq->setEditText("");

trunk/FACT++/gui/design.ui

@@ -52 +52 @@
       </property>
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <property name="documentMode">
@@ -1662 +1662 @@
                 </spacer>
                </item>
-               <item row="3" column="2" colspan="2">
+               <item row="3" column="1" colspan="2">
                 <widget class="QComboBox" name="fClockCondFreq">
                  <property name="frame">
@@ -1669 +1669 @@
                 </widget>
                </item>
-               <item row="2" column="2" colspan="3">
+               <item row="2" column="1" colspan="2">
                 <widget class="QLabel" name="label_133">
                  <property name="text">
@@ -1688 +1688 @@
                  </property>
                 </spacer>
+               </item>
+               <item row="3" column="4">
+                <widget class="QDoubleSpinBox" name="fClockCondFreqRes">
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                 <property name="buttonSymbols">
+                  <enum>QAbstractSpinBox::NoButtons</enum>
+                 </property>
+                 <property name="suffix">
+                  <string> MHz</string>
+                 </property>
+                 <property name="maximum">
+                  <double>10000.000000000000000</double>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="4">
+                <widget class="QLabel" name="label_143">
+                 <property name="text">
+                  <string>Calculated rate</string>
+                 </property>
+                </widget>
                </item>
               </layout>

trunk/FACT++/src/HeadersFTM.h

@@ -192 +192 @@
         uint16_t fDelayTimeMarker;         /// (4ns * x + 8ns) FTM internal programmable delay between trigger descision and time marker output
         uint16_t fDeadTime;                /// (4ns * x + 8ns) FTM internal programmable dead time after trigger decision
-        uint32_t fClockConditioner[8];     // R0, R1, R8, R9, R11, R13, R14, R15
+        uint32_t fClockConditioner[8];     /// R0, R1, R8, R9, R11, R13, R14, R15
         uint16_t fWindowPhysics;           /// (4ns * x + 8ns) At least N (multiplicity) rising edges (trigger signal) within this window
         uint16_t fWindowCalib;             /// (4ns * x + 8ns) At least N (multiplicity) rising edges (trigger signal) within this window