Skip to content
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.

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

Fiducial #11

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f58af9a
adding Mount moves for selected interesting positions
felipeaoli Jun 21, 2023
7f2673d
organizing imports
felipeaoli Jun 21, 2023
c21b0b8
Adapting spotfinder to multiple detections
felipeaoli Jun 22, 2023
0d3d8cc
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
felipeaoli Jun 22, 2023
2a928fc
adding new lib for fiducials
felipeaoli Jun 22, 2023
68a8c16
fix test
felipeaoli Jun 22, 2023
9a70fa4
Proto library
felipeaoli Jun 22, 2023
cc45522
Adding fiducials to database
felipeaoli Jun 22, 2023
c44daa4
ignoring spotfinder
felipeaoli Jun 22, 2023
bfbe85f
adding mvlabel to fiducial database
felipeaoli Jun 22, 2023
669b8fa
fixing small bugs
felipeaoli Jun 23, 2023
d4ff76d
merging
felipeaoli Jun 23, 2023
773c234
Merging
felipeaoli Jun 23, 2023
74be7bb
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
felipeaoli Jun 23, 2023
0c5db71
changing to branch mount
felipeaoli Jun 23, 2023
1be24d2
standalone tests for mount movement
felipeaoli Jun 23, 2023
d3a6cb4
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
seanmacb Jun 23, 2023
51d7dc3
remove cem120 defaults
felipeaoli Jun 23, 2023
59ab2ec
accomodating number of expected points
seanmacb Jun 23, 2023
daeb710
documentation
felipeaoli Jun 23, 2023
f78087d
small tweaks in fid mask
felipeaoli Jun 23, 2023
cd9de6d
debug of mount codes
seanmacb Jun 23, 2023
cde811b
debug of mount codes
seanmacb Jun 23, 2023
8997533
fiducial database
seanmacb Jun 23, 2023
fc087d1
mounttable example
Jun 23, 2023
1ad17c0
repeating n cycles
felipeaoli Jun 24, 2023
ffa0b6e
merging
felipeaoli Jun 24, 2023
91964f5
implementing ncycle option
felipeaoli Jun 24, 2023
52d402f
fixing bugs in the mountpositions and treating null mount option case
seanmacb Jun 24, 2023
22e2995
Printing the mount movements!
seanmacb Jun 24, 2023
9ef04fb
finished first arcsequence tests
seanmacb Jun 26, 2023
f3471e3
First analysis of arc-sequence tests
seanmacb Jun 26, 2023
7643e55
Add function library
seanmacb Jun 27, 2023
fc15e8c
Adding results from 50-arc sequence test, workaround for camera softw…
seanmacb Jun 27, 2023
da9162b
Adding analysis notebooks
seanmacb Jun 27, 2023
040c81d
Figures from arcphi results
seanmacb Jun 28, 2023
ccaba8e
regions should be ignored
felipeaoli Jun 28, 2023
1fd22b4
Update gitignore and some other paths
seanmacb Jun 28, 2023
deceda9
Database with 10ArcTheta test, figures from test included
seanmacb Jun 28, 2023
f51409d
library for report
felipeaoli Jun 29, 2023
53dd1b7
Structure of linear phi report
felipeaoli Jun 29, 2023
34c4bb5
trying to merge
felipeaoli Jun 29, 2023
2e564dc
merging gitignore
felipeaoli Jun 29, 2023
1bb541f
Adding logs file
Jun 29, 2023
562a14a
Copying Sean's report
felipeaoli Jun 29, 2023
f2503c0
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
felipeaoli Jun 29, 2023
ea3dc19
change ddof
felipeaoli Jun 29, 2023
5ca22e5
fixing stashed files, adding date capability to analysis
seanmacb Jun 29, 2023
abc59a9
Updated figures for all phi and 10 iteration arctheta tests
seanmacb Jun 29, 2023
4c0d46f
plots for presentation
felipeaoli Jun 30, 2023
cb66ea9
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
felipeaoli Jun 30, 2023
dba973f
plots
felipeaoli Jun 30, 2023
2ca0672
phi backlash test in db, arctheta figures
seanmacb Jun 30, 2023
053a218
Merge branch 'fiducial' of https://github.com/SSantosLab/DESI-QA into…
seanmacb Jun 30, 2023
500c905
Adding database to include second run of arcphi tests
seanmacb Jul 2, 2023
03cddb6
intial results of backlash test
seanmacb Jul 5, 2023
746e094
All backlash tests complete, databases updated
seanmacb Jul 6, 2023
dd08953
pushing analysis notebooks
seanmacb Jul 6, 2023
6ea9f4d
results from RS backlash tests - both motors around 2.2-2.3 degrees o…
seanmacb Jul 7, 2023
7c90640
Another arcphi test, no linphi observed
seanmacb Jul 13, 2023
c403064
Adding updated database from arctests
seanmacb Jul 13, 2023
11a5f0e
Backlash test, another linear phi test and result
seanmacb Jul 19, 2023
f322d74
several arcphi tests
seanmacb Jul 21, 2023
bfaf401
Arctest & beginning to update run_xytest.py
seanmacb Jul 25, 2023
cb2fc65
xytest in different mount configurations - unverified results
seanmacb Aug 8, 2023
5590c7a
Results from xytests - some positive (xy_12), some not so positive (x…
seanmacb Aug 9, 2023
459332c
Revised figures for xytesting, removed update center, getting better …
seanmacb Aug 17, 2023
edd88a8
Updating sleep times in run_xytest.py
seanmacb Aug 17, 2023
4a8102d
Commit before uzh
seanmacb Dec 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ sbigCam.py
desiarc-main/
sbigpics/
conninfo.txt
spotfinder/
spotfinder/__pycache__/*
spotfinder/*
*.pyc
regions.reg
70 changes: 70 additions & 0 deletions Calibrate_Positioner.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
'''
Program to take data for the fiducials and positioner, and return the important
'''

def get_timecol(db):
new = db.label.str.split("-", n=1, expand=True)
new.columns = ['label', 'session']
db['label'] = new['label']
db.insert(1, "session", new['session'])
db['session'] = pd.to_datetime(db['session'], format= '%Y%m%d-%H%M%S' )#.dt.time
return

def query_time(db, date=None, datemin=None, datemax=None):
"""
First run get_timecol(database)
datemin, datemax (str): e.g "2023-02-03 13:36:00"
"""

if date is not None:
return db['session'] == np.datetime64(date)

dmin = [np.datetime64(datemin) if not None else None][0]
dmax = [np.datetime64(datemax) if not None else None][0]

cond1 = db["session"] >= dmin
cond2 = db["session"] <= dmax
if (datemin is not None) & (datemax is not None):
return cond1 & cond2
elif datemin is None:
return cond2
elif datemax is None:
return cond1
else:
print("check datemin datemax fields")

if __name__=='__main__':

import find_center as fc

# Select data for fiducials



# Fiducial calibration



# Select data for positioner



# Theta calculation

xc1, yc1, Rarc1 = [i*pix2mm for i in fc.get_circle(db[m1],)] # center and radius of theta arc

# Phi calculation

xc2, yc2, R2 = [i*pix2mm for i in fc.get_circle(db[m2])] # center and radius of phi arc

# R_theta calculation

R1 = np.hypot(xc2-xc1, yc2-yc1)

# Hardstop calculation

hardStop = angle_between(np.array([xc,yc]), np.array([xc+5,yc]), (xc2,yc2))

# Return important values

return R1,R2,xc,yc,hardStop,pix2mm
Loading