Changeset 12498
- Timestamp:
- 11/12/11 01:25:54 (13 years ago)
- Location:
- trunk/FACT++
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/gui/MainWindow.cc
r12415 r12498 381 381 } 382 382 383 void MainWindow::on_fDrsCalibStart_clicked() 384 { 385 Dim::SendCommand("FAD_CONTROL/START_DRS_CALIBRATION"); 386 } 387 388 void MainWindow::on_fDrsCalibReset_clicked() 389 { 390 Dim::SendCommand("FAD_CONTROL/RESET_SECONDARY_DRS_BASELINE"); 391 } 392 383 393 void MainWindow::SetTriggerSequence() 384 394 { … … 394 404 } 395 405 396 void on_fEnableTrigger_clicked(bool b) 406 /* 407 void MainWindow::on_fEnableTrigger_clicked(bool b) 397 408 { 398 409 Dim::SendCommand("FTM_CONTROL/ENABLE_TRIGGER", b); 399 410 } 400 411 401 void on_fEnableExt1_clicked(bool b)412 void MainWindow::on_fEnableExt1_clicked(bool b) 402 413 { 403 414 Dim::SendCommand("FTM_CONTROL/ENABLE_EXT1", b); 404 415 } 405 416 406 void on_fEnableExt2_clicked(bool b)417 void MainWindow::on_fEnableExt2_clicked(bool b) 407 418 { 408 419 Dim::SendCommand("FTM_CONTROL/ENABLE_EXT2", b); 409 420 } 410 421 411 void on_fEnableVeto_clicked(bool b)422 void MainWindow::on_fEnableVeto_clicked(bool b) 412 423 { 413 424 Dim::SendCommand("FTM_CONTROL/ENABLE_VETO", b); 414 425 } 415 426 */ 416 427 void MainWindow::on_fPhysicsCoincidence_valueChanged(int v) 417 428 { -
trunk/FACT++/gui/MainWindow.h
r12415 r12498 101 101 void on_fFadDac7Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 7); } 102 102 103 void on_fDrsCalibStart_clicked(); 104 void on_fDrsCalibReset_clicked(); 105 103 106 // Tab: Adc 104 107 virtual void DisplayEventData() = 0; -
trunk/FACT++/gui/design.ui
r12496 r12498 11 11 <x>0</x> 12 12 <y>0</y> 13 <width>14 19</width>13 <width>1422</width> 14 14 <height>985</height> 15 15 </rect> … … 53 53 </property> 54 54 <property name="currentIndex"> 55 <number> 4</number>55 <number>8</number> 56 56 </property> 57 57 <property name="documentMode"> … … 8400 8400 <item> 8401 8401 <widget class="QSpinBox" name="fAdcCrate"> 8402 <property name="alignment"> 8403 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 8404 </property> 8402 8405 <property name="maximum"> 8403 8406 <number>3</number> … … 8417 8420 <item> 8418 8421 <widget class="QSpinBox" name="fAdcBoard"> 8422 <property name="alignment"> 8423 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 8424 </property> 8419 8425 <property name="maximum"> 8420 8426 <number>9</number> … … 8434 8440 <item> 8435 8441 <widget class="QSpinBox" name="fAdcChip"> 8442 <property name="alignment"> 8443 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 8444 </property> 8436 8445 <property name="minimum"> 8437 8446 <number>0</number> … … 8454 8463 <item> 8455 8464 <widget class="QSpinBox" name="fAdcChannel"> 8465 <property name="alignment"> 8466 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 8467 </property> 8456 8468 <property name="maximum"> 8457 8469 <number>8</number> … … 8568 8580 <widget class="QLabel" name="label_184"> 8569 8581 <property name="text"> 8570 <string>DRS Calib RunNo</string>8582 <string>DRS Calibration</string> 8571 8583 </property> 8572 8584 <property name="alignment"> … … 8579 8591 <property name="orientation"> 8580 8592 <enum>Qt::Horizontal</enum> 8593 </property> 8594 </widget> 8595 </item> 8596 <item> 8597 <widget class="QPushButton" name="fDrsCalibStart"> 8598 <property name="text"> 8599 <string>Start</string> 8581 8600 </property> 8582 8601 </widget> … … 8791 8810 </item> 8792 8811 </layout> 8812 </item> 8813 <item> 8814 <widget class="QPushButton" name="fDrsCalibrationReset"> 8815 <property name="text"> 8816 <string>Reset</string> 8817 </property> 8818 </widget> 8793 8819 </item> 8794 8820 <item> … … 13932 13958 <enum>QAbstractSpinBox::NoButtons</enum> 13933 13959 </property> 13960 <property name="currentSection"> 13961 <enum>QDateTimeEdit::HourSection</enum> 13962 </property> 13963 <property name="displayFormat"> 13964 <string>hh:mm:ss</string> 13965 </property> 13966 <property name="calendarPopup"> 13967 <bool>false</bool> 13968 </property> 13969 <property name="timeSpec"> 13970 <enum>Qt::OffsetFromUTC</enum> 13971 </property> 13934 13972 <property name="time"> 13935 13973 <time> … … 13938 13976 <second>0</second> 13939 13977 </time> 13940 </property>13941 <property name="currentSection">13942 <enum>QDateTimeEdit::HourSection</enum>13943 </property>13944 <property name="displayFormat">13945 <string>hh:mm:ss</string>13946 </property>13947 <property name="calendarPopup">13948 <bool>false</bool>13949 </property>13950 <property name="timeSpec">13951 <enum>Qt::OffsetFromUTC</enum>13952 13978 </property> 13953 13979 </widget> … … 14074 14100 <enum>QAbstractSpinBox::NoButtons</enum> 14075 14101 </property> 14102 <property name="currentSection"> 14103 <enum>QDateTimeEdit::HourSection</enum> 14104 </property> 14105 <property name="displayFormat"> 14106 <string>hh:mm:ss</string> 14107 </property> 14108 <property name="calendarPopup"> 14109 <bool>false</bool> 14110 </property> 14111 <property name="timeSpec"> 14112 <enum>Qt::OffsetFromUTC</enum> 14113 </property> 14076 14114 <property name="time"> 14077 14115 <time> … … 14080 14118 <second>0</second> 14081 14119 </time> 14082 </property>14083 <property name="currentSection">14084 <enum>QDateTimeEdit::HourSection</enum>14085 </property>14086 <property name="displayFormat">14087 <string>hh:mm:ss</string>14088 </property>14089 <property name="calendarPopup">14090 <bool>false</bool>14091 </property>14092 <property name="timeSpec">14093 <enum>Qt::OffsetFromUTC</enum>14094 14120 </property> 14095 14121 </widget> … … 15607 15633 <x>0</x> 15608 15634 <y>0</y> 15609 <width>14 19</width>15610 <height>2 0</height>15635 <width>1422</width> 15636 <height>21</height> 15611 15637 </rect> 15612 15638 </property> -
trunk/FACT++/src/DataCalib.cc
r12475 r12498 31 31 32 32 fProcessing = false; 33 } 34 35 bool DataCalib::ResetTrgOff(DimDescribedService &dim) 36 { 37 if (fData.fStep!=3) 38 return false; 39 40 for (int i=1024*1440*3+4; i<1440*1024*6+160*1024*2+4; i++) 41 fStats[i] = 0; 42 43 reinterpret_cast<uint32_t*>(fStats.data())[0] = 0; 44 reinterpret_cast<uint32_t*>(fStats.data())[3] = 0; 45 46 fData.fStep = 1; 47 Update(dim); 48 fData.fStep = 2; 49 50 return true; 33 51 } 34 52 -
trunk/FACT++/src/DataCalib.h
r12475 r12498 31 31 32 32 static void Restart(); 33 static bool ResetTrgOff(DimDescribedService &dim); 33 34 static void Update(DimDescribedService &dim); 34 35
Note:
See TracChangeset
for help on using the changeset viewer.