Commit c92ea4c2 authored by myron's avatar myron
Browse files

reactivating CDI

parent 73f91de8
......@@ -8,8 +8,6 @@ variables:
VENV_DIR: /dev/shm/gitlab_ci/xrstools/venv
USE_CLEAN_VENV: "false"
test:
stage: test
only:
......@@ -32,9 +30,9 @@ test:
script:
- python -m pip install .
- cd nonregressions
# - /usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a python non_reg_testing_XRS.py
- /usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a python non_reg_testing_XRS.py
- /usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a python non_reg_testing_XRS_small.py
# - /usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a python non_reg_testing_XRS_raman_extraction.py
- /usr/bin/xvfb-run --server-args="-screen 0 1024x768x24" -a python non_reg_testing_XRS_raman_extraction.py
- deactivate
after_script:
......
......@@ -685,7 +685,7 @@ class plotContainer(QtGui.QWidget) :
if len(regionNorm):
norm = np.trapz(data[regionNorm,1],data[regionNorm,0])
print(" NOOOOOOOOOOOOOOOOOOOOOOOOOOOORM ", norm)
print(" NORM ", norm)
data[:,1] /= norm
data[:,2] /= norm
np.savetxt(prefix+"_"+self.name+".txt",data)
......
......@@ -40,11 +40,11 @@ def check_results(fn_a, fn_b):
raise
ref = np.interp( a[:,0], b[:,0], b[:,1] )
try:
assert( (abs( a[:,1] - ref)[np.less( c0, a[:,0])* np.less( a[:,0], c1)] ).sum() <1.0e-5 )
assert( (abs( a[:,1] - ref)[np.less( c0, a[:,0])* np.less( a[:,0], c1)] ).sum() <1.0e-4 )
except:
raise
......@@ -193,7 +193,7 @@ for t in l:
myw.plusLine.clicked.emit(True)
qWait( ms=40)
myw.abstract[1][1].setText("mediumq")
l = myw.abstract[1][3+24:3+24+24]
l = myw.abstract[1][3+24:3+24+11]+myw.abstract[1][3+24+12:3+24+24]
for t in l:
t.cb.setChecked(True)
......@@ -375,7 +375,6 @@ myw.lineEdit_outputPrefix.setText("non_reg_output_gui_raman")
myw.pushButton_saveAnalysis.clicked.emit(True)
qWait( ms=40)
qWait( ms=40)
check_results("non_reg_output_gui_raman_lowq.txt","non_reg_output_gui_raman_reference_lowq.txt")
check_results("non_reg_output_gui_raman_mediumq.txt","non_reg_output_gui_raman_reference_mediumq.txt")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment