a2p2 0.2.14__py3-none-any.whl → 0.7.4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. a2p2/__main__.py +40 -1
  2. a2p2/chara/facility.py +54 -4
  3. a2p2/chara/gui.py +31 -5
  4. a2p2/client.py +158 -31
  5. a2p2/facility.py +14 -1
  6. a2p2/gui.py +46 -12
  7. a2p2/instrument.py +3 -0
  8. a2p2/jmmc/__init__.py +7 -0
  9. a2p2/jmmc/catalogs.py +129 -0
  10. a2p2/jmmc/generated_models.py +191 -0
  11. a2p2/jmmc/models.py +104 -0
  12. a2p2/jmmc/services.py +16 -0
  13. a2p2/jmmc/utils.py +130 -0
  14. a2p2/jmmc/webservices.py +48 -0
  15. a2p2/ob.py +98 -9
  16. a2p2/samp.py +20 -0
  17. a2p2/version.py +210 -131
  18. a2p2/vlti/conf/GRAVITY_ditTable.json +21 -19
  19. a2p2/vlti/conf/GRAVITY_rangeTable.json +200 -28
  20. a2p2/vlti/conf/MATISSE_rangeTable.json +58 -22
  21. a2p2/vlti/conf/PIONIER_ditTable.json +1 -1
  22. a2p2/vlti/conf/PIONIER_rangeTable.json +16 -18
  23. a2p2/vlti/facility.py +160 -43
  24. a2p2/vlti/gravity.py +243 -311
  25. a2p2/vlti/gui.py +165 -39
  26. a2p2/vlti/instrument.py +266 -49
  27. a2p2/vlti/matisse.py +61 -147
  28. a2p2/vlti/pionier.py +34 -157
  29. {a2p2-0.2.14.dist-info → a2p2-0.7.4.dist-info}/METADATA +34 -20
  30. a2p2-0.7.4.dist-info/RECORD +39 -0
  31. {a2p2-0.2.14.dist-info → a2p2-0.7.4.dist-info}/WHEEL +1 -1
  32. {a2p2-0.2.14.dist-info → a2p2-0.7.4.dist-info}/entry_points.txt +0 -1
  33. a2p2/vlti/confP104/GRAVITY_ditTable.json +0 -122
  34. a2p2/vlti/confP104/GRAVITY_rangeTable.json +0 -202
  35. a2p2/vlti/confP104/MATISSE_ditTable.json +0 -2
  36. a2p2/vlti/confP104/MATISSE_rangeTable.json +0 -202
  37. a2p2/vlti/confP104/PIONIER_ditTable.json +0 -77
  38. a2p2/vlti/confP104/PIONIER_rangeTable.json +0 -118
  39. a2p2/vlti/confP105/GRAVITY_ditTable.json +0 -37
  40. a2p2/vlti/confP105/GRAVITY_rangeTable.json +0 -42
  41. a2p2/vlti/confP105/MATISSE_ditTable.json +0 -2
  42. a2p2/vlti/confP105/MATISSE_rangeTable.json +0 -44
  43. a2p2/vlti/confP105/PIONIER_ditTable.json +0 -25
  44. a2p2/vlti/confP105/PIONIER_rangeTable.json +0 -38
  45. a2p2-0.2.14.dist-info/RECORD +0 -44
  46. {a2p2-0.2.14.dist-info → a2p2-0.7.4.dist-info}/LICENSE +0 -0
  47. {a2p2-0.2.14.dist-info → a2p2-0.7.4.dist-info}/top_level.txt +0 -0
a2p2/version.py CHANGED
@@ -1,121 +1,268 @@
1
- __version__ = "0.2.14"
1
+ __version__ = "0.7.4"
2
2
 
3
3
  __release_notes__ = {
4
4
  # "0.1.6": {
5
- # "STATUS":[
6
- # "This version get lot of changes and may contain bugs or missing features, please provide any feedback to improve and prepare a better future release !"
7
- # ],
8
5
  # "A2P2": [
9
- #
10
6
  # ],
11
7
  # "VLTI": [
12
- #
13
8
  # ],
14
9
  # "CHARA": [
15
- #
16
- # ],
17
- # "TODO-SCIENCE": [
18
- #
19
- # ],
20
- # "TODO-DEV": [
21
- #
22
10
  # ],
23
11
  # },
24
- "0.2.14": {
25
- "STATUS": [
26
- "Bug fix"
12
+ #
13
+ # "TODO-SCIENCE": [
14
+ # "Merge AO or GS in a same code section for every instruments",
15
+ # "Check DIT table from the last template user manuals (especially MATISSE) and remove PIONIER's one",
16
+ # "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values?",
17
+ # ],
18
+ # "TODO-DEV": [
19
+ # "Support multiple period version (two major at least)",
20
+ # "Support numlist keyword : eg. SEQ.HWPOFF (done in conf but must be range check compatible)",
21
+ # "Unify ob name creation in vlti instrument createOB()",
22
+ # "Complete test suite with more real p2 submissions",
23
+ # "Try to read OB in P2 and send them back to Aspro2 as a new obs",
24
+ # ],
25
+
26
+ "0.7.4": {
27
+ "A2P2": [
28
+ "Use pyproject.toml for python installation",
29
+ ],"VLTI": [
30
+ "Do not switch PIONIER mode to FREE when the magnitude of the IAS star is too high : an error may be provided by p2"
31
+ ],
32
+ },"0.7.3": {
33
+ "CHARA": [
34
+ "Better reuse of last working queueserver"
35
+ ],
36
+ },"0.7.2": {
37
+ "A2P2": [
38
+ "Auto update chara queueserver preference",
39
+ "a2p2 -r generates release-notes.md (rendered on a2p2 repository)"
40
+ ],
41
+ "VLTI": [
42
+ "Bugfix to support missin preference file"
43
+ ],
44
+ "CHARA": [
45
+ "Support and try every queueserver's Urls comma separated from the queuserver user preference"
46
+ ],
47
+ },"0.7.1": {
48
+ "A2P2": [
49
+ "Fix ttk import on MacOS",
50
+ ],
51
+ "VLTI": [
52
+ "Add first P112 support using radiobutton to select proper onaxis offaxis or wide GRAVITY templates",
53
+ "Improve coordinate's checks and computations",
54
+ "Add FT's propermotions and parallax"
55
+ ],
56
+ "CHARA": [
57
+ "Display log of received OB also for calibrators"
58
+ ]
59
+ },"0.6.9": {
60
+ "A2P2": [
61
+ "ctrl-c support improved to qui a2p2 from terminal",
62
+ ],
63
+ "VLTI": [
64
+ "OB's tree list selection mode limited to a single selection",
65
+ "OB are stacked if Aspro2 send an OB without proper tree selection. stacked OB can be submitted after proper container selection or cancelled",
66
+ "Provide checkboxes of types of interferometric observations to complete full OB"
67
+ ],
68
+ "CHARA": [
69
+ ],
70
+ },"0.6.8": {
71
+ "A2P2": [
72
+ "increase astropy version to avoid a dependency issue with numy"
73
+ ],
74
+ },"0.6.7": {
75
+ "CHARA": [
76
+ "Enhance information while using OB2 server prototype",
77
+ ]
78
+ }, "0.6.6": {
79
+ "CHARA": [
80
+ "Fix formating of OB supporting array of observability time intervals",
81
+ ],
82
+ },"0.6.5": {
83
+ "CHARA": [
84
+ "Experimental: forward OBs through json payload to the location defined in preference",
27
85
  ],
86
+ },"0.6.4": {
28
87
  "A2P2": [
88
+ "Fix import that may break run on windows..."
29
89
  ],
90
+ },"0.6.3": {
30
91
  "VLTI": [
92
+ "Always use GRAVITY acqTSF.SEQ_INS_SOBJ_HMAG after P110",
31
93
  ],
32
- "CHARA": [
94
+ },"0.6.2": {
95
+ "VLTI": [
96
+ "Fix GRAVITY gen acq tsf",
33
97
  ],
34
- "TODO-SCIENCE": [
35
- "Check DIT table from last template user manuals",
36
- "Use a calibrator template for MATISSE (instead of default hyb_obs)",
37
- "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values"
98
+ },"0.6.1": {
99
+ "VLTI": [
100
+ "Updated configuration for ESO P111",
101
+ ]
102
+ },"0.6.0": {
103
+ "A2P2": [
104
+ "Read Extra_informations from last Aspro2 OBXML"
38
105
  ],
39
- "TODO-DEV": [
40
- "Support multiple period version (two major at least)",
41
- "Add warning if Aspro2's IP versions differs from the selected container" ,
42
- "Support numlist keyword : eg. SEQ.HWPOFF",
43
- "Optimize VLTI run chooser : DEMO tests suffer from a long run filtering",
44
- "Unify ob name creation in vlti instrument createOB()",
45
- "Complete test suite with real p2 submission"
106
+ },"0.5.3": {
107
+ "VLTI": [
108
+ "Update DIT tables to last instrument template (version is stored in the table config to report warning)",
109
+ "Do not stop OB creation if K mag is out of range during DIT calculation but show a warning and ask to proceed or abort",
110
+ ]
111
+ },"0.4.6": {
112
+ "A2P2": [
113
+ "Huge speedup of ESO P2 runs treeview",
114
+ "Explicit SAMP unregister reduce risk of SAMP ghosts",
46
115
  ],
47
- },
48
- "0.2.13": {
49
- "STATUS": [
116
+ "VLTI": [
117
+ "Check consistency between Aspro2 inteferometer period and RUN's IP version",
118
+ "Handle use SEQ.INS.SOBJ.HMAG after P110 instead of SEQ.FI.HMAG",
50
119
  ],
120
+ },"0.4.5": {
51
121
  "A2P2": [
52
- "A2P2 is no longer python2 compatible. Hope it will be ok for everybody ? Send an issue else ;)",
53
- "Fix generated release note order according to semver values",
54
- "Dry tests done looping on a few OBXML files"
55
- "Added -c option to a2p2 so we generated a config file ( helps to automatically fill P2 login info & autologin : )"
122
+ "clarify some text in the default generated preference file",
56
123
  ],
57
124
  "VLTI": [
58
- "Conf updated with IPs 106.25",
59
- "BugFix: OB no more sent to P2 if OB's instrument is not the same than p2 selected container"
125
+ "Change log message : Run filled -> OB transmitted",
126
+ "Missing flux error message enhanced : show associated target name",
127
+ "Handle ALPHA DELTA coordinates of associated guide star",
128
+ "MATISSE: handle Aspro2's frindge tracker mode : None or GRA4MAT",
129
+ "MATISSE: define DPR.CATG (always was CALIB)",
130
+ "MATISSE: use V band for COU.GS.MAG or try G one on ATs.",
131
+ "GRAVITY: include dual keywords in gravity_rangeTable",
132
+ ],
133
+ },"0.4.4": {
134
+ "A2P2": [
135
+ "add Catalog.piname() to get a pi name for a given jmmc account looking at a given catalog (jmmc.login preference is used without parameter)",
136
+ "Add new preference to put jmmc account credentials",
60
137
  ],
61
- "CHARA": [
138
+ },"0.4.3": {
139
+ "A2P2": [
140
+ "Enhance a2p2.jmmc.models._model so it automagically computes component names >{(())>",
62
141
  ],
63
- },
64
- "0.2.12": {
65
- "STATUS": [
142
+ },"0.4.2": {
143
+ "A2P2": [
144
+ "Add option to select public CatalogAPI server",
66
145
  ],
146
+ },"0.4.1": {
67
147
  "A2P2": [
68
- "Fix import in main console script"
148
+ "Add version alpha of a2p2.fr.webservices.Calliper client",
149
+ ],
150
+ }, "0.4.0": {
151
+ "A2P2": [
152
+ "First basic support of SAMP messages from Aspro for models",
153
+ "Support model compositions in models module",
154
+ ],
155
+ }, "0.3.10": {
156
+
157
+ "A2P2": [
158
+ "Fix bug that occurs when user has no preference file",
159
+ "Add new serialisation of a2p2.jmmc.Models"
69
160
  ],
161
+ }, "0.3.9": {
70
162
  "VLTI": [
163
+ "Bugfix for single CAL SCI",
71
164
  ],
72
- "CHARA": [
165
+ }, "0.3.8": {
166
+ "VLTI": [
167
+ "Enhance CAL SCI sequence : [CAL1] SCI [CAL2 [SCI CAL3 [...] ] ] ",
168
+ "Fix COU_AG_PMA and COU_AG_PMD for MATISSE acq template",
169
+ "Do not throw a dialog for every submitted OBs",
170
+ "Enhance some messages",
171
+ # "BugFix to create a folder on non tutorial accounts"
172
+ ],
173
+
174
+ }, "0.3.7": {
175
+ "VLTI": [
176
+ "Revert SEQ.RELOFF.X/Y = 0.0 (same as default) for GRAVITY dual_obs_exp template"
177
+ ],
178
+ }, "0.3.6": {
179
+ "VLTI": [
180
+ "Disable SEQ.RELOFF.X for GRAVITY dual to make OB compliant"
181
+ ],
182
+ }, "0.3.5": {
183
+ "VLTI": [
184
+ "Accept to add calibrator inside a Concatenation container",
185
+ "Use p2.iss.vltitype preference keys to set supported value of instrument's acquisition templates. ( run 'a2p2 -c' )"
73
186
  ],
74
187
  },
75
- "0.2.11": {
76
- "STATUS": [
188
+ "0.3.4": {
189
+ "VLTI": [
190
+ "Sync templates with P109",
191
+ "Create OB in selected folder: do not create anymore a folder but create a concatenation for SM if a Run's root is selected."
77
192
  ],
193
+ },
194
+ "0.3.3": {
78
195
  "A2P2": [
79
- "enhance setup.py so it install Windows special-cases .exe files"
196
+ "Add basic support of Aspro2's model for SAMP interoperability",
80
197
  ],
81
198
  "VLTI": [
199
+ "Fix missing import for p2api module"
82
200
  ],
83
- "CHARA": [
201
+ },
202
+ "0.3.2": {
203
+ "A2P2": [
204
+ "Improve setup.py that now requires python 3+ and a fresh version of astropy",
205
+ ],
206
+ "VLTI": [
207
+ # "revert back to p2 requests use which now reuses connections",
84
208
  ],
85
209
  },
86
- "0.2.10": {
87
- "STATUS": [
210
+ "0.3.1": {
211
+ "A2P2": [
212
+ "Bug fix for authenticated Catalog access",
88
213
  ],
214
+ },
215
+ "0.3.0": {
89
216
  "A2P2": [
90
- "Patch bad SAMP url handling on Windows"
217
+ "Give a try to embedd some code to interact with JMMC services",
91
218
  ],
92
219
  "VLTI": [
220
+ # "revert back to p2 requests use which now reuses connections",
93
221
  ],
94
- "CHARA": [
222
+ },
223
+ "0.2.15": {
224
+ "VLTI": [
225
+ # "add a wrapper on p2 to make run's tree faster (~2.5x)",
95
226
  ],
96
227
  },
97
- "0.2.9": {
98
- "STATUS": [
228
+ "0.2.14": {
229
+ "A2P2": [
230
+ "BugFix: ask for container Name only if one is selected"
99
231
  ],
232
+ },
233
+ "0.2.13": {
100
234
  "A2P2": [
101
-
235
+ "A2P2 is no longer python2 compatible. Hope it will be ok for everybody ? Send an issue else ;)",
236
+ "Fix generated release note order according to semver values",
237
+ "Dry tests done looping on a few OBXML files"
238
+ "Added -c option to a2p2 so we generated a config file ( helps to automatically fill P2 login info & autologin : )"
102
239
  ],
103
240
  "VLTI": [
104
- "Fix bug that prevent to create any folder or concatenation at RUNS's root"
241
+ "Conf updated with IPs 106.25",
242
+ "BugFix: OB no more sent to P2 if OB's instrument is not the same than p2 selected container"
105
243
  ],
106
- "CHARA": [
107
-
244
+ },
245
+ "0.2.12": {
246
+ "A2P2": [
247
+ "Fix import in main console script"
108
248
  ],
109
- "TODO-SCIENCE": [
110
-
249
+ },
250
+ "0.2.11": {
251
+ "A2P2": [
252
+ "enhance setup.py so it install Windows special-cases .exe files"
111
253
  ],
112
- "TODO-DEV": [
113
-
254
+ },
255
+ "0.2.10": {
256
+ "A2P2": [
257
+ "Patch bad SAMP url handling on Windows"
114
258
  ],
115
259
  },
116
- "0.2.8": {
117
- "STATUS": [
260
+ "0.2.9": {
261
+ "VLTI": [
262
+ "Fix bug that prevent to create any folder or concatenation at RUNS's root"
118
263
  ],
264
+ },
265
+ "0.2.8": {
119
266
  "A2P2": [
120
267
  "Fix release notes order in the GUI",
121
268
  "Handle special jmmc account, kindly set by ESO colleagues to perfom future tests as closed as possible to the real UX"
@@ -126,10 +273,6 @@ __release_notes__ = {
126
273
  ],
127
274
  "CHARA": [
128
275
  ],
129
- "TODO-SCIENCE": [
130
- ],
131
- "TODO-DEV": [
132
- ]
133
276
  }, "0.2.7": {
134
277
  "STATUS": [
135
278
  "This version get lot of changes and may contain bugs or missing features, please provide any feedback to improve and prepare a better future release !"
@@ -147,96 +290,41 @@ __release_notes__ = {
147
290
  "Support Concatenations (also shown in the tree panel)",
148
291
  "Show type in the container chooser instead of containerID"
149
292
  ],
150
- "CHARA": [
151
- ],
152
- "TODO-SCIENCE": [
153
- "Complete/fix GRAVITY DIT table with P105 changes that will come in the next template user manual",
154
- "Use a calibrator template for MATISSE (instead of default hyb_obs)",
155
- "flag ~important~ keyword that MUST be set in a2p2 code to avoid default"
156
- ],
157
- "TODO-DEV": [
158
- "Support numlist keyword : eg. SEQ.HWPOFF",
159
- "Optimize VLTI run chooser : DEMO tests suffer from a long run filtering",
160
- "Do not set default values in a2p2 if not set",
161
- "unify ob name creation in vlti instrument createOB()"
162
- ]
163
293
  }, "0.2.6": {
164
- "A2P2": [
165
-
166
- ],
167
294
  "VLTI": [
168
295
  "Support baseline back again (single one at present)"
169
296
  ],
170
- "CHARA": [
171
-
172
- ]
173
297
  },
174
298
  "0.2.5": {
175
- "A2P2": [
176
-
177
- ],
178
299
  "VLTI": [
179
300
  "Add missing template name in log",
180
301
  "Fix error removing baseline after constraint changes on P2 side. Next a2p2 version should add them back in acq templates"
181
302
  ],
182
- "CHARA": [
183
-
184
- ]
185
303
  },
186
304
  "0.2.4": {
187
- "A2P2": [
188
-
189
- ],
190
305
  "VLTI": [
191
306
  "Fix bug / wrong keys"
192
307
  ],
193
- "CHARA": [
194
-
195
- ]
196
308
  },
197
309
  "0.2.3": {
198
- "A2P2": [
199
-
200
- ],
201
310
  "VLTI": [
202
311
  "Hide password in login frame"
203
312
  ],
204
- "CHARA": [
205
-
206
- ]
207
313
  },
208
314
  "0.2.2": {
209
- "A2P2": [
210
-
211
- ],
212
315
  "VLTI": [
213
316
  "ignore default time constraints computed by Aspro"
214
317
  ],
215
- "CHARA": [
216
-
217
- ]
218
318
  },
219
319
  "0.2.1": {
220
- "A2P2": [
221
-
222
- ],
223
320
  "VLTI": [
224
321
  "fix support for a list of multiples time constraints"
225
322
  ],
226
- "CHARA": [
227
-
228
- ]
229
323
  },
230
324
  "0.2.0": {
231
- "A2P2": [
232
-
233
- ],
234
325
  "VLTI": [
235
326
  "bug fix"
236
327
  ],
237
- "CHARA": [
238
-
239
- ]
240
328
  },
241
329
  "0.1.6": {
242
330
  "A2P2": [
@@ -246,20 +334,11 @@ __release_notes__ = {
246
334
  "general config updates",
247
335
  "add PIONIER"
248
336
  ],
249
- "CHARA": [
250
-
251
- ]
252
337
  },
253
338
  "0.1.5": {
254
- "A2P2": [
255
-
256
- ],
257
339
  "VLTI": [
258
340
  "bugfix for dualfield cases"
259
341
  ],
260
- "CHARA": [
261
-
262
- ]
263
342
  },
264
343
  "0.1.4": {
265
344
  "A2P2": [
@@ -2,36 +2,38 @@
2
2
  "AT": {
3
3
  "DET2.DIT": {"default": 0.3, "list": ["0.3", "1", "3", "10", "30", "100", "300"]},
4
4
  "HIGH": {
5
- "IN": {
6
- "DIT": [ 0.3, 1, 3, 10, 30 ],
7
- "MAG": [ -4, -3, -2, -0.25 , 1.0, 4.5 ]
8
- },
9
5
  "OUT": {
10
- "DIT": [ 1, 10, 30 ],
11
- "MAG": [ -2, 0, 2, 9 ]
6
+ "DIT": [ 0.3, 1, 3, 10, 30, 100, 300 ],
7
+ "MAG": [ -1.5, 0.0, 1.0, 2.5, 3.5, 5.0, 6.0, 8.0 ]
8
+ },
9
+ "IN": {
10
+ "DIT": [ 0.3, 1, 3, 10, 30, 100, 300 ],
11
+ "MAG": [ -2.5, -1.0, 0.0, 1.5, 2.5, 4.0, 5.0, 7.0 ]
12
12
  }
13
13
  },
14
14
  "MED": {
15
- "IN": {
16
- "DIT": [ 0.3, 1, 3, 10, 30 ],
17
- "MAG": [ -2, 0, 1.5, 2.75, 4, 9.0 ]
18
- },
19
15
  "OUT": {
20
- "DIT": [ 0.3, 1, 3, 10, 30 ],
21
- "MAG": [ -1, 1.0, 2.5, 3.25, 4.5, 9 ]
16
+ "DIT": [ 0.3, 1, 3, 10, 30, 100, 300 ],
17
+ "MAG": [ 1.0, 2.5, 3.5, 5.0, 6.0, 7.5, 8.5, 10.5 ]
18
+ },
19
+ "IN": {
20
+ "DIT": [ 0.3, 1, 3, 10, 30, 100, 300 ],
21
+ "MAG": [ 0.5, 2.0, 3.0, 4.5, 5.5, 7.0, 8.0, 10.0 ]
22
22
  }
23
23
  },
24
24
  "LOW": {
25
- "IN": {
26
- "DIT": [ 0.3, 1, 3, 10 , 30 ],
27
- "MAG": [ 1.5, 4, 6, 8, 9.0 , 10.5 ]
28
- },
29
25
  "OUT": {
30
- "DIT": [ 0.3, 1, 3, 10, 30 ],
31
- "MAG": [ 2.5, 5, 7, 8.5, 9.5, 11 ]
26
+ "DIT": [ 0.3, 1, 3, 10, 30 ],
27
+ "MAG": [ 4.5, 5.5, 7.0, 8.0, 9.5, 11.5 ]
28
+ },
29
+ "IN": {
30
+ "DIT": [ 0.3, 1, 3, 10, 30 ],
31
+ "MAG": [ 4.0, 5.0, 6.5, 7.5, 9.0, 11.0 ]
32
32
  }
33
33
  },
34
34
  "Kdf": 0.7,
35
35
  "Kut": 3
36
- }
36
+ },
37
+ "VERSION":"P109b",
38
+ "DEVSINFO":"OUT<=>Combined, IN<=>Split / leave integer value of DIT (else range check will fail comparing associated string values)"
37
39
  }