added another camera; added another scan type
This commit is contained in:
@ -101,24 +101,28 @@ def camera_tag(daq):
|
||||
|
||||
cam1 = create_cam('SATES21-CAMS154-M1')
|
||||
cam2 = create_cam('SATES24-CAMS161-M1')
|
||||
cam1 = create_cam('SATES21-CAMS-PATT1')
|
||||
cam3 = create_cam('SATES21-CAMS-PATT1')
|
||||
cam4 = create_cam('SATES21-CAMS154-M2')
|
||||
#cam1 = create_cam('SARFE10-PSSS059')
|
||||
|
||||
cam1["scanPoints"]=[10,25,40,50,65,80]
|
||||
cam2["scanPoints"]=[10,25,40,50,65,80]
|
||||
cam1["scanPoints"]=[10,25,40,50,65,80, 100]
|
||||
cam2["scanPoints"]=[10,25,40,50,65,80, 100]
|
||||
cam4["scanPoints"]=[10,25,40,50,65,80, 100]
|
||||
|
||||
cam1["scanPoints"]=[10,20,30,40,50,60,70,80,90]
|
||||
cam2["scanPoints"]=[10,25,40,55,70,85]
|
||||
#cam1["scanPoints"]=[10,20,30,40,50,60,70,80,90]
|
||||
#cam2["scanPoints"]=[10,25,40,55,70,85]
|
||||
modesToScan =[1,2,0,3]
|
||||
|
||||
cam1["maxX"] =2560
|
||||
cam1["maxY"] =2160
|
||||
cam2["maxX"] =2560
|
||||
cam2["maxY"] =2160
|
||||
cam4["maxX"] =2560
|
||||
cam4["maxY"] =2160
|
||||
|
||||
mode = 0
|
||||
n_shots = 2500
|
||||
scantype=2 #0 two camera scan
|
||||
scantype=3 #0 two camera scan
|
||||
#1 mode scan with 1 camera
|
||||
#2 spot measurement
|
||||
|
||||
@ -176,6 +180,25 @@ def camera_tag(daq):
|
||||
fn = f"test_cam1_single_pt_"
|
||||
daq.acquire(fn, n_pulses=n_shots)
|
||||
|
||||
if scantype==3: #Mode scan
|
||||
for i in modesToScan: #i is the mode
|
||||
for j in cam4['scanPoints']: #j is the fill %age
|
||||
fn = f"test_cam1_{j}_mode_{i}_"
|
||||
print(fn)
|
||||
xs,xe,ys,ye,vf1=calcROI(cam4,i,j)
|
||||
changeROI (cam4,xs,xe,ys,ye)
|
||||
PV("SGE-CPCW-C4-EVR0:Pul01-Delay-SP" ).put(10500-vf1*100)
|
||||
if vf1>40:
|
||||
PV("SATES21-CAMS154-M1:SW_PULSID_SRC").put(5) #5=9000uS
|
||||
else:
|
||||
PV("SATES21-CAMS154-M1:SW_PULSID_SRC").put(2) #3=5500uS (2=4500uS)
|
||||
|
||||
print(10500-vf1*100);
|
||||
time.sleep(30)
|
||||
daq.acquire(fn, n_pulses=n_shots)
|
||||
|
||||
time.sleep(5)
|
||||
|
||||
|
||||
#xs,xe,ys,ye=calcROI(cam1,2,20)
|
||||
#print(xs, xe, ys, ye)
|
||||
|
Reference in New Issue
Block a user