Skip to content

Commit e31f63b

Browse files
author
Cindy Wang
committed
revert back to previous commit
1 parent bec77ca commit e31f63b

File tree

1 file changed

+39
-107
lines changed

1 file changed

+39
-107
lines changed

‎src/firefly/test/python/demo-notebook.ipynb

Lines changed: 39 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
{
44
"cell_type": "code",
55
"execution_count": null,
6-
"metadata": {
7-
"collapsed": false
8-
},
6+
"metadata": {},
97
"outputs": [],
108
"source": [
119
"import os\n",
@@ -36,9 +34,7 @@
3634
{
3735
"cell_type": "code",
3836
"execution_count": null,
39-
"metadata": {
40-
"collapsed": false
41-
},
37+
"metadata": {},
4238
"outputs": [],
4339
"source": [
4440
"fc.launch_browser()"
@@ -47,9 +43,7 @@
4743
{
4844
"cell_type": "code",
4945
"execution_count": null,
50-
"metadata": {
51-
"collapsed": false
52-
},
46+
"metadata": {},
5347
"outputs": [],
5448
"source": [
5549
"#file= fc.uploadFile('./data/c.fits')\n",
@@ -62,9 +56,7 @@
6256
{
6357
"cell_type": "code",
6458
"execution_count": null,
65-
"metadata": {
66-
"collapsed": false
67-
},
59+
"metadata": {},
6860
"outputs": [],
6961
"source": [
7062
"fc.add_extension(\"AREA_SELECT\", 'p1', 'crop2', 'second crop', image_src='/hydra/cm/firefly/src/firefly/html/images/icons-2014/16x16_Filter.png')\n",
@@ -77,31 +69,25 @@
7769
{
7870
"cell_type": "code",
7971
"execution_count": null,
80-
"metadata": {
81-
"collapsed": false
82-
},
72+
"metadata": {},
8373
"outputs": [],
8474
"source": [
85-
"fc.set_zoom('p1', 5)\n"
75+
"fc.set_zoom('p1', 5)"
8676
]
8777
},
8878
{
8979
"cell_type": "code",
9080
"execution_count": null,
91-
"metadata": {
92-
"collapsed": false
93-
},
81+
"metadata": {},
9482
"outputs": [],
9583
"source": [
96-
"fc.set_pan('p1', 100, 100)\n"
84+
"fc.set_pan('p1', 100, 100)"
9785
]
9886
},
9987
{
10088
"cell_type": "code",
10189
"execution_count": null,
102-
"metadata": {
103-
"collapsed": false
104-
},
90+
"metadata": {},
10591
"outputs": [],
10692
"source": [
10793
"#fc.addMask(\"m1\",5,1,\"#FF00FF\",'p1', \"maskStuff\")"
@@ -110,9 +96,7 @@
11096
{
11197
"cell_type": "code",
11298
"execution_count": null,
113-
"metadata": {
114-
"collapsed": false
115-
},
99+
"metadata": {},
116100
"outputs": [],
117101
"source": [
118102
"#fc.removeMask(\"m1\")"
@@ -121,9 +105,7 @@
121105
{
122106
"cell_type": "code",
123107
"execution_count": null,
124-
"metadata": {
125-
"collapsed": false
126-
},
108+
"metadata": {},
127109
"outputs": [],
128110
"source": [
129111
"#pParams= { 'URL' : 'http://web.ipac.caltech.edu/staff/roby/demo/wise-m51-band4.fits','ColorTable' : '9', 'title': 'hello'}\n",
@@ -136,9 +118,7 @@
136118
{
137119
"cell_type": "code",
138120
"execution_count": null,
139-
"metadata": {
140-
"collapsed": false
141-
},
121+
"metadata": {},
142122
"outputs": [],
143123
"source": [
144124
"fc.set_zoom('p2', .5)"
@@ -147,9 +127,7 @@
147127
{
148128
"cell_type": "code",
149129
"execution_count": null,
150-
"metadata": {
151-
"collapsed": false
152-
},
130+
"metadata": {},
153131
"outputs": [],
154132
"source": [
155133
"fc.set_zoom('p2', 2.0)"
@@ -158,9 +136,7 @@
158136
{
159137
"cell_type": "code",
160138
"execution_count": null,
161-
"metadata": {
162-
"collapsed": false
163-
},
139+
"metadata": {},
164140
"outputs": [],
165141
"source": [
166142
"file= fc.upload_file('./data/c.fits')\n",
@@ -172,40 +148,33 @@
172148
{
173149
"cell_type": "code",
174150
"execution_count": null,
175-
"metadata": {
176-
"collapsed": false
177-
},
151+
"metadata": {},
178152
"outputs": [],
179153
"source": [
180154
"inFile= os.getcwd() + '/data/c.reg'\n",
181155
"f= open(inFile, 'r+')\n",
182156
"contents= f.read()\n",
183157
"uf= fc.upload_text_data(contents)\n",
184158
"print uf\n",
185-
"fc.overlay_region_layer(file_on_server=uf, title='test c region', region_layer_id=\"regOnP3\", plot_id=['p3'])\n"
159+
"fc.overlay_region_layer(file_on_server=uf, title='test c region', region_layer_id=\"regOnP3\", plot_id=['p3'])"
186160
]
187161
},
188162
{
189163
"cell_type": "code",
190164
"execution_count": null,
191-
"metadata": {
192-
"collapsed": false
193-
},
165+
"metadata": {},
194166
"outputs": [],
195167
"source": [
196168
"file = fc.upload_file('./data/test5.reg')\n",
197169
"print file\n",
198170
"#fc.overlayRegion(file, 'test5 region', 'regOnP1', ['p1'])\n",
199-
"fc.overlay_region_layer(file_on_server=file, title='test5 region', region_layer_id='regOnP1')\n"
171+
"fc.overlay_region_layer(file_on_server=file, title='test5 region', region_layer_id='regOnP1')"
200172
]
201173
},
202174
{
203175
"cell_type": "code",
204176
"execution_count": null,
205-
"metadata": {
206-
"collapsed": false,
207-
"scrolled": true
208-
},
177+
"metadata": {},
209178
"outputs": [],
210179
"source": [
211180
"reg= ['point 211 22 # color=pink text={region 1/7} point=cross 9', \n",
@@ -222,9 +191,7 @@
222191
{
223192
"cell_type": "code",
224193
"execution_count": null,
225-
"metadata": {
226-
"collapsed": false
227-
},
194+
"metadata": {},
228195
"outputs": [],
229196
"source": [
230197
"fc.delete_region_layer('regOnP2', 'p2')"
@@ -233,9 +200,7 @@
233200
{
234201
"cell_type": "code",
235202
"execution_count": null,
236-
"metadata": {
237-
"collapsed": false
238-
},
203+
"metadata": {},
239204
"outputs": [],
240205
"source": [
241206
"regPoly= ['PHYSICAL;polygon 425 225 480 415 450 450 #color=cyan']\n",
@@ -247,9 +212,7 @@
247212
{
248213
"cell_type": "code",
249214
"execution_count": null,
250-
"metadata": {
251-
"collapsed": false
252-
},
215+
"metadata": {},
253216
"outputs": [],
254217
"source": [
255218
"fc.add_region_data(regPoly, 'regOnP2More')"
@@ -258,9 +221,7 @@
258221
{
259222
"cell_type": "code",
260223
"execution_count": null,
261-
"metadata": {
262-
"collapsed": false
263-
},
224+
"metadata": {},
264225
"outputs": [],
265226
"source": [
266227
"delReg= 'physical;line 400 130 560 230'\n",
@@ -270,9 +231,7 @@
270231
{
271232
"cell_type": "code",
272233
"execution_count": null,
273-
"metadata": {
274-
"collapsed": false
275-
},
234+
"metadata": {},
276235
"outputs": [],
277236
"source": [
278237
"#fc.deleteRegion('regOnP1', 'p1')\n",
@@ -282,9 +241,7 @@
282241
{
283242
"cell_type": "code",
284243
"execution_count": null,
285-
"metadata": {
286-
"collapsed": false
287-
},
244+
"metadata": {},
288245
"outputs": [],
289246
"source": [
290247
"fc.delete_region_layer('regOnP2More', 'p2')"
@@ -293,9 +250,7 @@
293250
{
294251
"cell_type": "code",
295252
"execution_count": null,
296-
"metadata": {
297-
"collapsed": false
298-
},
253+
"metadata": {},
299254
"outputs": [],
300255
"source": [
301256
"fc.delete_region_layer('regOnP3')"
@@ -304,9 +259,7 @@
304259
{
305260
"cell_type": "code",
306261
"execution_count": null,
307-
"metadata": {
308-
"collapsed": false
309-
},
262+
"metadata": {},
310263
"outputs": [],
311264
"source": [
312265
"fc.set_zoom(['p1', 'p2', 'p3'])"
@@ -315,9 +268,7 @@
315268
{
316269
"cell_type": "code",
317270
"execution_count": null,
318-
"metadata": {
319-
"collapsed": false
320-
},
271+
"metadata": {},
321272
"outputs": [],
322273
"source": [
323274
"#rv = fc.createRangeValuesZScale('Log')\n",
@@ -327,9 +278,7 @@
327278
{
328279
"cell_type": "code",
329280
"execution_count": null,
330-
"metadata": {
331-
"collapsed": false
332-
},
281+
"metadata": {},
333282
"outputs": [],
334283
"source": [
335284
"#rv= fc.createRangeValuesStandard('Log', 'percent',1,96)\n",
@@ -339,9 +288,7 @@
339288
{
340289
"cell_type": "code",
341290
"execution_count": null,
342-
"metadata": {
343-
"collapsed": false
344-
},
291+
"metadata": {},
345292
"outputs": [],
346293
"source": [
347294
"ft = fc.upload_file('./data/sample.tbl')\n",
@@ -352,9 +299,7 @@
352299
{
353300
"cell_type": "code",
354301
"execution_count": null,
355-
"metadata": {
356-
"collapsed": false
357-
},
302+
"metadata": {},
358303
"outputs": [],
359304
"source": [
360305
"for i in range(len(reg)):\n",
@@ -364,9 +309,7 @@
364309
{
365310
"cell_type": "code",
366311
"execution_count": null,
367-
"metadata": {
368-
"collapsed": true
369-
},
312+
"metadata": {},
370313
"outputs": [],
371314
"source": [
372315
"import os\n",
@@ -376,9 +319,7 @@
376319
{
377320
"cell_type": "code",
378321
"execution_count": null,
379-
"metadata": {
380-
"collapsed": false
381-
},
322+
"metadata": {},
382323
"outputs": [],
383324
"source": [
384325
"print imageFileName"
@@ -387,20 +328,11 @@
387328
{
388329
"cell_type": "code",
389330
"execution_count": null,
390-
"metadata": {
391-
"collapsed": true
392-
},
331+
"metadata": {},
393332
"outputs": [],
394-
"source": []
395-
},
396-
{
397-
"cell_type": "code",
398-
"execution_count": null,
399-
"metadata": {
400-
"collapsed": true
401-
},
402-
"outputs": [],
403-
"source": []
333+
"source": [
334+
""
335+
]
404336
}
405337
],
406338
"metadata": {
@@ -413,7 +345,7 @@
413345
"language_info": {
414346
"codemirror_mode": {
415347
"name": "ipython",
416-
"version": 2
348+
"version": 2.0
417349
},
418350
"file_extension": ".py",
419351
"mimetype": "text/x-python",
@@ -425,4 +357,4 @@
425357
},
426358
"nbformat": 4,
427359
"nbformat_minor": 0
428-
}
360+
}

0 commit comments

Comments
 (0)