Skip to content

Simple #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bfrosik wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Simple #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7e9f9af
Fixed cpu issue in feedback
bfrosik Nov 15, 2017
1bf9bf2
Update handler.py
bfrosik Nov 15, 2017
63d067a
Update feed.py
bfrosik Nov 15, 2017
24cb227
Update containers.py
bfrosik Nov 15, 2017
85c2967
fixed double server issue
bfrosik Dec 4, 2017
cbe86d9
Added ZeroMQ receiving option in a real time
bfrosik Feb 2, 2018
933127b
Added ZeroMQ sending to consumer option in a real time
bfrosik Feb 6, 2018
0afc038
Added 'ver' process variable that contains result of all quality checks
bfrosik Feb 8, 2018
8ba8b6f
Update zmq_consumer.py
bfrosik Feb 15, 2018
60d45a7
Added ver feedback gui and control
bfrosik Feb 27, 2018
06583bc
Merge remote-tracking branch 'origin/master'
bfrosik Feb 27, 2018
b213e59
Added zmq start/stop verifier from gui
bfrosik Feb 27, 2018
2c2833e
Removed the ver PV and modified window_ver control
bfrosik Feb 28, 2018
4e7da95
Change the scheme for quality check naming
bfrosik Feb 28, 2018
0fa0e06
fix argument name
bfrosik Feb 28, 2018
a97eb5e
Moved start of feedack driver before feed starts, other enhancements.
bfrosik Mar 13, 2018
57e9b61
Update window_ver.py
bfrosik Mar 13, 2018
3c27cf9
Update window_ver.py
bfrosik Mar 15, 2018
86c5562
Update window_ver.py
bfrosik Mar 20, 2018
1dd736b
Modified the feedback pv, added text
bfrosik Apr 23, 2018
706d070
handler working serially in one process
bfrosik Apr 23, 2018
a224981
handler working serially in one process
bfrosik Apr 24, 2018
fe29eeb
restart verifier on modification
bfrosik Apr 24, 2018
5714543
restart verifier on modification
bfrosik Apr 24, 2018
c2a13fc
fixed config
bfrosik Apr 24, 2018
fafd00e
reorganized, added clients directory, and feeds directory
bfrosik Apr 30, 2018
9967ef2
Added pvaccess based feed
bfrosik Jun 1, 2018
3cd6c54
Added pvaccess based feed
bfrosik Jun 6, 2018
0631f72
Added handling for Mona project
bfrosik Jun 13, 2018
07f7a9d
Added callback_pv configuration, changed names for 12-ID, refactored
bfrosik Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions config/12id/S12-PILATUS1/dqconfig.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
'time_zone' = 'America/Chicago'

#real-time verifier
'feedback_type' = console, pv
'detector' = pilatus300
'detector_basic' = cam1
'detector_image' = image1
'cnt_rate' = True
'feedback_type' = pv_12, a
'detector' = S12-PILATUS1
'decor' = acq_time > S12-PILATUS1:cam1:AcquireTime, file_name > S12-PILATUS1:cam1:FullFileName_RBV
'callback_pv' = S12-PILATUS1:cam1:FullFileName_RBV
'no_frames' = -1

38 changes: 19 additions & 19 deletions config/12id/S12-PILATUS1/schemas/limits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"data" : {
"sum" : {
"low_limit" : 100,
"high_limit" : 2300
},
"sat" : {
"low_limit" : 0,
"high_limit" : 2300
},
"frame_sat" : {
"low_limit" : 0,
"high_limit" : 4000
},
"rate_sat" : {
"low_limit" : 100,
"high_limit" : 2300
}
}
}
"data": {
"frame_sat_cnt_rate": {
"high_limit": 2300
},
"sum": {
"high_limit": 100000,
"low_limit": -10000000
},
"point_sat_rate": {
"high_limit": 230000
},
"point_sat": {
"high_limit": 100000
},
"frame_sat_pts": {
"high_limit": 10000
}
}
}
2 changes: 1 addition & 1 deletion config/12id/S12-PILATUS1/schemas/quality_checks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "data" : ["QUALITYCHECK_SUM", "QUALITYCHECK_FRAME_SAT", "QUALITYCHECK_RATE_SAT"]}
{ "data" : ["sum", "frame_sat_pts", "frame_sat_cnt_rate"]}
8 changes: 3 additions & 5 deletions config/12id/pilatus300/dqconfig.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
'time_zone' = 'America/Chicago'

#real-time verifier
'feedback_type' = console, pv
'feedback_type' = console, pv_12
'detector' = pilatus300
'detector_basic' = cam1
'detector_image' = image1
'cnt_rate' = True
'decor' = acq_time > pilatus300:cam1:AcquireTime, file_name > pilatus300:cam1:FullFileName_RBV
'callback_pv' = pilatus300:cam1:FullFileName_RBV
'no_frames' = -1

38 changes: 19 additions & 19 deletions config/12id/pilatus300/schemas/limits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"data" : {
"sum" : {
"low_limit" : 100,
"high_limit" : 2300
},
"sat" : {
"low_limit" : 0,
"high_limit" : 2300
},
"frame_sat" : {
"low_limit" : 0,
"high_limit" : 4000
},
"rate_sat" : {
"low_limit" : 100,
"high_limit" : 2300
}
}
}
"data": {
"frame_sat_cnt_rate": {
"high_limit": 2300
},
"sum": {
"high_limit": 100000,
"low_limit": -10000000
},
"point_sat_rate": {
"high_limit": 230000
},
"point_sat": {
"high_limit": 100000
},
"frame_sat_pts": {
"high_limit": 10000
}
}
}
2 changes: 1 addition & 1 deletion config/12id/pilatus300/schemas/quality_checks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "data" : ["QUALITYCHECK_SUM", "QUALITYCHECK_FRAME_SAT", "QUALITYCHECK_RATE_SAT"]}
{ "data" : ["sum", "frame_sat_pts", "frame_sat_cnt_rate"]}
5 changes: 2 additions & 3 deletions config/12id/start_verifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@
from multiprocessing.managers import SyncManager
import os
from os.path import expanduser
import dquality.realtime.real_time as real
import dquality.real_time_pv as real
import argparse
import json
import sys
import time

Expand Down Expand Up @@ -168,7 +167,7 @@ def start_server(arg):
#key = 'test'
#os.system("medm -x /local/bfrosik/data-quality/config/12id/test/qualityFeedbackTest.adl &")
else:
print 'not supported instrument'
print ('not supported instrument')

home = expanduser("~")
conf = os.path.join(home, ".dquality", instrument)
Expand Down
162 changes: 162 additions & 0 deletions config/12id/verui.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>689</width>
<height>564</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>40</x>
<y>20</y>
<width>200</width>
<height>34</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detector&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="det_name"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>40</x>
<y>80</y>
<width>591</width>
<height>256</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Minimum Integrated Counts of a Frame</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Maximum Integrated Counts of a Frame</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Saturation Count of a Pixel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Maximum Number of Saturated Pixels of a Frame</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Saturation Count Rate of a Pixel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Maximum Number of Count Rate Saturation Pixels of a Frame</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLineEdit" name="frame_sum_ll"/>
</item>
<item>
<widget class="QLineEdit" name="frame_sum_hl"/>
</item>
<item>
<widget class="QLineEdit" name="point_sat_hl"/>
</item>
<item>
<widget class="QLineEdit" name="frame_sat_pts_hl"/>
</item>
<item>
<widget class="QLineEdit" name="point_sat_rate_hl"/>
</item>
<item>
<widget class="QLineEdit" name="frame_sat_pts_rate_hl"/>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QListWidget" name="list_failed">
<property name="geometry">
<rect>
<x>40</x>
<y>350</y>
<width>591</width>
<height>121</height>
</rect>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>689</width>
<height>28</height>
</rect>
</property>
<widget class="QMenu" name="menuVerifier">
<property name="title">
<string>Verifier</string>
</property>
<addaction name="actionStart_verifier"/>
<addaction name="actionStop_verifier"/>
</widget>
<addaction name="menuVerifier"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="actionStart_verifier">
<property name="text">
<string>start verifier</string>
</property>
</action>
<action name="actionStop_verifier">
<property name="text">
<string>stop verifier</string>
</property>
</action>
</widget>
<resources/>
<connections/>
</ui>
Loading