Changeset 11105


Ignore:
Timestamp:
06/22/11 13:51:47 (13 years ago)
Author:
tbretz
Message:
Added the default values for the clock conditioner, marked with a star.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/gui/FactGui.h

    r11102 r11105  
    21892189        fClockCondFreq->addItem("1 GHz",   QVariant(1000));
    21902190        fClockCondFreq->addItem("2 GHz",   QVariant(2000));
     2191        fClockCondFreq->addItem("2 GHz (*)",   QVariant(2001));
    21912192        fClockCondFreq->addItem("3 GHz",   QVariant(3000));
    21922193        fClockCondFreq->addItem("4 GHz",   QVariant(4000));

  • trunk/FACT++/src/ftmctrl.cc

    r11102 r11105  
    10711071        fDimError         ("FTM_CONTROL/ERROR",           "X:1;S:1;S:28", ""),
    10721072        fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
    1073         fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;S:8;S:90;S:160;S:40;S:40", ""),
     1073        fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;I:8;S:90;S:160;S:40;S:40", ""),
    10741074        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40", ""),
    10751075        fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6", "")
    … …  
    14381438        static const uint64_t freq1000[8] = { 0x0003a000, R1, R8, R9, R11, R13, 0x0830400e, 0x1400fa0f };
    14391439        static const uint64_t freq2000[8] = { 0x00035000, R1, R8, R9, R11, R13, 0x0830400e, 0x1400fa0f };
     1440        static const uint64_t freq2001[8] = { 0x00038000, R1, R8, R9, R11, R13, 0x0830280e, 0x1400fa0f };
    14401441        static const uint64_t freq3000[8] = { 0x00037200, R1, R8, R9, R11, R13, 0x0830400e, 0x1420a30f };
    14411442        static const uint64_t freq4000[8] = { 0x00032800, R1, R8, R9, R11, R13, 0x0830400e, 0x1400fa0f };
    … …  
    14491450        case 1000: reg = freq1000; break;
    14501451        case 2000: reg = freq2000; break;
     1452        case 2001: reg = freq2001; break;
    14511453        case 3000: reg = freq3000; break;
    14521454        case 4000: reg = freq4000; break;
Note: See TracChangeset for help on using the changeset viewer.