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