Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-astronomy/scamp/files: scamp-1.7.0-plplot599.patch scamp-1.4.6-autotools.patch scamp-1.5.5-autotools.patch
Date: Tue, 03 Jan 2012 02:43:30
Message-Id: 20120103024313.4C3D12004E@flycatcher.gentoo.org
1 bicatali 12/01/03 02:43:13
2
3 Added: scamp-1.7.0-plplot599.patch
4 Removed: scamp-1.4.6-autotools.patch
5 scamp-1.5.5-autotools.patch
6 Log:
7 Added a patch for plplot-5.9.9, thanks Jan Kohnert, bug #396723
8
9 (Portage version: 2.1.10.41/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch?rev=1.1&content-type=text/plain
16
17 Index: scamp-1.7.0-plplot599.patch
18 ===================================================================
19 diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/astrcplot.c scamp-1.7.0-r2/src/astrcplot.c
20 --- scamp-1.7.0/src/astrcplot.c 2009-09-10 15:10:02.000000000 +0200
21 +++ scamp-1.7.0-r2/src/astrcplot.c 2012-01-01 20:23:46.809506421 +0100
22 @@ -87,7 +87,7 @@
23 plfont(2);
24 plschr(0.0, 0.3);
25 plwid(0);
26 - plcol(7);
27 + plcol0(7);
28 mark[0] = 500;
29 space[0] = 500;
30 for (wcspos[0] = -180.0; wcspos[0]<=180.0; wcspos[0]+=14.999)
31 @@ -138,7 +138,7 @@
32 {
33 field = fgroups[g]->field;
34 nfield = fgroups[g]->nfield;
35 - plcol(15);
36 + plcol0(15);
37 for (f=0; f<nfield; f++)
38 {
39 set = field[f]->set;
40 @@ -172,7 +172,7 @@
41 x[i] = rawpos2[0];
42 y[i] = rawpos2[1];
43 }
44 - plcol(3);
45 + plcol0(3);
46 plline(37, x,y);
47 }
48
49 @@ -814,7 +814,7 @@
50 psize = 1.0;
51
52 plfont(2);
53 - plcol(15);
54 + plcol0(15);
55 plschr(0.0, 0.67);
56 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
57 plwid(lwid);
58 @@ -851,9 +851,9 @@
59 }
60 plssym(0.0, psize);
61 plwid(lsize);
62 - plcol(3);
63 + plcol0(3);
64 plpoin((PLINT)npoint, x,y, 11);
65 - plcol(1);
66 + plcol0(1);
67 plpoin((PLINT)(nsamp-npoint), x2,y2, 0);
68 free(x);
69 free(y);
70 @@ -888,12 +888,12 @@
71 *(yt++) = (PLFLT)samp->projpos[lat];
72 }
73 plwid(lsize);
74 - plcol(8);
75 + plcol0(8);
76 if (lsize)
77 plpoin((PLINT)(xt-x), x,y, 17);
78 else
79 plpoin((PLINT)(xt-x), x,y, 1);
80 - plcol(4);
81 + plcol0(4);
82 plpoin((PLINT)(x+nsamp-x2t), x2t,y2t, 2);
83 free(x);
84 free(y);
85 @@ -901,7 +901,7 @@
86 plwid(2*lwid);
87 if (field->cplot_colour==15)
88 {
89 - plcol(15);
90 + plcol0(15);
91 cplot_drawbounds(set->wcs, wcs);
92 }
93 }
94 @@ -914,7 +914,7 @@
95 if (field->cplot_colour!=15)
96 {
97 plwid(3*lwid);
98 - plcol(field->cplot_colour);
99 + plcol0(field->cplot_colour);
100 for (s=0; s<field->nset; s++)
101 {
102 set = field->set[s];
103 @@ -923,7 +923,7 @@
104 }
105 }
106
107 - plcol(7);
108 + plcol0(7);
109 plwid(lwid);
110 cplot_drawcoordgrid(wcs, xmin, xmax, ymin, ymax);
111 plflush();
112 @@ -1025,16 +1025,16 @@
113 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
114 plwid(lwid);
115 plfont(2);
116 - plcol(15);
117 + plcol0(15);
118 plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
119 sprintf(str, "#uInstrument A%d: distortion map", field->astromlabel+1);
120 pllab("","", str);
121 plwid(0);
122 - plcol(7);
123 + plcol0(7);
124 cplot_drawloccoordgrid(wcs, xmin, xmax, ymin, ymax);
125
126 pllsty(1);
127 - plcol(15);
128 + plcol0(15);
129 plscmap1n(256);
130
131 scalemin = BIG;
132 @@ -1104,7 +1104,7 @@
133
134 wcsptr[0] = set->wcs;
135 wcsptr[1] = wcs;
136 - plshades(scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
137 + plshades((const PLFLT **)scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
138 xstep/2.0+0.5, set->wcs->naxisn[lng]-xstep/2.0+0.5,
139 ystep/2.0+0.5, set->wcs->naxisn[lat]-ystep/2.0+0.5,
140 clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, distort_map, wcsptr);
141 @@ -1112,7 +1112,7 @@
142 plwid(0);
143 cplot_drawfgrids(set->wcs, wcs);
144 */
145 - plcol(7);
146 + plcol0(7);
147 plwid(lwid);
148 cplot_drawbounds(set->wcs, wcs);
149 }
150 @@ -1126,10 +1126,10 @@
151
152 plvpor(0.91,0.935,0.115,0.885);
153 plwind(0.0,1.0,scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC);
154 - plshades(scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
155 + plshades((const PLFLT **)scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
156 scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC, clevel,
157 CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
158 - plcol(15);
159 + plcol0(15);
160 plschr(0.0, 0.5);
161 plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
162 sprintf(str, "%s", mscale < 0.09*ARCSEC/DEG?
163 @@ -1304,19 +1304,19 @@
164 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
165 plwid(lwid);
166 plfont(2);
167 - plcol(15);
168 + plcol0(15);
169 plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
170 sprintf(str, "#uInstrument A%d: map of astrometric systematics (internal)",
171 field0->astromlabel+1);
172 pllab("","", str);
173 plwid(0);
174 - plcol(7);
175 + plcol0(7);
176 cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
177 y[0] = y[1] = 3.0;
178 x[0] = 7.0;
179 x[1] = x[0] + scalel;
180 pllsty(1);
181 - plcol(15);
182 + plcol0(15);
183 plwid(lwid*3);
184 plline(2,x,y);
185 plwid(lwid);
186 @@ -1333,7 +1333,7 @@
187 for (s=0; s<nset; s++)
188 {
189 set0 = field0->set[s];
190 - plcol(7);
191 + plcol0(7);
192 cplot_drawbounds(set0->wcs, wcs0);
193 lng = set0->lng;
194 lat = set0->lat;
195 @@ -1455,9 +1455,9 @@
196 y[0] = vecpos[lat];
197 y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
198 plwid(lwid*2);
199 - plcol(3);
200 + plcol0(3);
201 plline(2, x,y);
202 - plcol(15);
203 + plcol0(15);
204 plpoin(1,x,y,1);
205 plwid(lwid);
206 }
207 @@ -1618,20 +1618,20 @@
208 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
209 plwid(lwid);
210 plfont(2);
211 - plcol(15);
212 + plcol0(15);
213 plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
214 plschr(0.0, 0.8);
215 sprintf(str, "#uInstrument A%d: map of astrometric systematics (reference)",
216 field0->astromlabel+1);
217 pllab("","", str);
218 plwid(0);
219 - plcol(7);
220 + plcol0(7);
221 cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
222 y[0] = y[1] = 3.0;
223 x[0] = 7.0;
224 x[1] = x[0] + scalel;
225 pllsty(1);
226 - plcol(15);
227 + plcol0(15);
228 plwid(lwid*3);
229 plline(2,x,y);
230 plwid(lwid);
231 @@ -1648,7 +1648,7 @@
232 for (s=0; s<nset; s++)
233 {
234 set0 = field0->set[s];
235 - plcol(7);
236 + plcol0(7);
237 cplot_drawbounds(set0->wcs, wcs0);
238 lng = set0->lng;
239 lat = set0->lat;
240 @@ -1759,9 +1759,9 @@
241 y[0] = vecpos[lat];
242 y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
243 plwid(lwid*2);
244 - plcol(1);
245 + plcol0(1);
246 plline(2, x,y);
247 - plcol(15);
248 + plcol0(15);
249 plpoin(1,x,y,1);
250 plwid(lwid);
251 }
252 @@ -1833,7 +1833,7 @@
253
254 /*-- Now plot! */
255 /* Internal chi2/d.o.f. first */
256 - plcol(15);
257 + plcol0(15);
258 plschr(0.0,0.5);
259 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
260 plwid(lwid);
261 @@ -1971,7 +1971,7 @@
262
263 /*-- Now plot! */
264 /* Internal chi2/d.o.f. first */
265 - plcol(15);
266 + plcol0(15);
267 plschr(0.0,0.5);
268 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
269 plwid(lwid);
270 @@ -2217,13 +2217,13 @@
271 r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
272 r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
273 plscmap1l(1, 2, cpoint, r, g, b, NULL);
274 - plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
275 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
276 - clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
277 + plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
278 + NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
279 + maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
280 }
281 else
282 {
283 - plcol(1);
284 + plcol0(1);
285 plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
286 maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
287 }
288 @@ -2232,23 +2232,24 @@
289 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
290 r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
291 plscmap1l(1, 2, cpoint, r, g, b, NULL);
292 - plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
293 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
294 - 0.5, zmax_hsn[d3],
295 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
296 + plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN,
297 + CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2],
298 + fgroup->projposmax[d2], -maxlim, maxlim,
299 + 0.5, zmax_hsn[d3], fgroup->projposmin[d2],
300 + fgroup->projposmax[d2], -maxlim, maxlim);
301 }
302 sprintf(xlabel, "AXIS%d [pixels]", d2+1);
303 sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
304 plscolbg(255,255,255); /* Force the background colour to white */
305 plscol0(15, 0,0,0); /* Force the foreground colour to black */
306 /* 1D histograms */
307 - plcol(3);
308 + plcol0(3);
309 plwid(2*lwid);
310 plline(CPLOT_NADERRHISTBIN, cuty[d3], cutbin);
311 - plcol(7);
312 + plcol0(7);
313 plline(CPLOT_NADERRHISTBIN, cuty_hsn[d3], cutbin);
314 plwid(lwid);
315 - plcol(15);
316 + plcol0(15);
317 plwid(lwid);
318 xl[0] = fgroup->projposmin[d2] - margin;
319 xl[1] = fgroup->projposmax[d2];
320 @@ -2459,13 +2460,13 @@
321 r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
322 r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
323 plscmap1l(1, 2, cpoint, r, g, b, NULL);
324 - plshades(histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
325 + plshades((const PLFLT **)histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
326 -maxlim,maxlim, -maxlim,maxlim,
327 clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
328 }
329 else
330 {
331 - plcol(1);
332 + plcol0(1);
333 plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
334 }
335
336 @@ -2474,7 +2475,7 @@
337 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
338 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
339 plscmap1l(1, 2, cpoint, r, g, b, NULL);
340 - plimage(histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
341 + plimage((const PLFLT **)histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
342 -maxlim,maxlim, -maxlim, maxlim,
343 0.5, zmax_hsn,
344 -maxlim, maxlim, -maxlim, maxlim);
345 @@ -2484,7 +2485,7 @@
346 plscol0(15, 0,0,0); /* Force the foreground colour to black */
347 plschr(0.0,0.5);
348 /* Pixel footprint */
349 - plcol(15);
350 + plcol0(15);
351 pllsty(3);
352 xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
353 yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
354 @@ -2493,15 +2494,15 @@
355 plline(5, xl, yl);
356 pllsty(1);
357 /* 1D histograms */
358 - plcol(3);
359 + plcol0(3);
360 plwid(2*lwid);
361 plline(CPLOT_NADERRHISTBIN, cutbin, cutx);
362 plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
363 - plcol(7);
364 + plcol0(7);
365 plline(CPLOT_NADERRHISTBIN, cutbin, cutx_hsn);
366 plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
367 plwid(lwid);
368 - plcol(15);
369 + plcol0(15);
370 plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
371 sprintf(str, "Group ##%d: 2D internal astrometric errors", fgroup->no);
372 pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
373 @@ -2725,13 +2726,13 @@
374 r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
375 r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
376 plscmap1l(1, 2, cpoint, r, g, b, NULL);
377 - plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
378 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
379 - clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
380 + plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
381 + NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
382 + maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
383 }
384 else
385 {
386 - plcol(1);
387 + plcol0(1);
388 plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
389 maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
390 }
391 @@ -2740,23 +2741,24 @@
392 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
393 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
394 plscmap1l(1, 2, cpoint, r, g, b, NULL);
395 - plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
396 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
397 - 0.5, zmax_hsn[d3],
398 - fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
399 + plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN,
400 + CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2],
401 + fgroup->projposmax[d2], -maxlim, maxlim,
402 + 0.5, zmax_hsn[d3], fgroup->projposmin[d2],
403 + fgroup->projposmax[d2], -maxlim, maxlim);
404 }
405 plscolbg(255,255,255); /* Force the background colour to white */
406 plscol0(15, 0,0,0); /* Force the foreground colour to black */
407 sprintf(xlabel, "AXIS%d [pixels]", d2+1);
408 sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
409 /*---- 1D histograms */
410 - plcol(1);
411 + plcol0(1);
412 plwid(2*lwid);
413 plline(CPLOT_NREFERRHISTBIN, cuty[d3], cutbin);
414 - plcol(7);
415 + plcol0(7);
416 plline(CPLOT_NREFERRHISTBIN, cuty_hsn[d3], cutbin);
417 plwid(lwid);
418 - plcol(15);
419 + plcol0(15);
420 plwid(lwid);
421 xl[0] = fgroup->projposmin[d2] - margin;
422 xl[1] = fgroup->projposmax[d2];
423 @@ -2964,13 +2966,13 @@
424 r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
425 r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
426 plscmap1l(1, 2, cpoint, r, g, b, NULL);
427 - plshades(histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
428 + plshades((const PLFLT **)histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
429 -maxlim,maxlim, -maxlim,maxlim,
430 clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
431 }
432 else
433 {
434 - plcol(1);
435 + plcol0(1);
436 plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
437 }
438 if (zmax_hsn>=1.0)
439 @@ -2978,16 +2980,15 @@
440 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
441 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
442 plscmap1l(1, 2, cpoint, r, g, b, NULL);
443 - plimage(histo_hsn, CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
444 - -maxlim,maxlim, -maxlim, maxlim,
445 - 0.5, zmax_hsn,
446 - -maxlim, maxlim, -maxlim, maxlim);
447 + plimage((const PLFLT **)histo_hsn, CPLOT_REFERR2DN_HSN,
448 + CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
449 + 0.5, zmax_hsn, -maxlim, maxlim, -maxlim, maxlim);
450 }
451 plscolbg(255,255,255); /* Force the background colour to white */
452 plscol0(15, 0,0,0); /* Force the foreground colour to black */
453 plschr(0.0,0.5);
454 /* Pixel footprint */
455 - plcol(15);
456 + plcol0(15);
457 pllsty(3);
458 xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
459 yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
460 @@ -2996,15 +2997,15 @@
461 plline(5, xl, yl);
462 pllsty(1);
463 /* 1D histograms */
464 - plcol(1);
465 + plcol0(1);
466 plwid(2*lwid);
467 plline(CPLOT_NREFERRHISTBIN, cutbin, cutx);
468 plline(CPLOT_NREFERRHISTBIN, cuty, cutbin);
469 - plcol(7);
470 + plcol0(7);
471 plline(CPLOT_NREFERRHISTBIN, cutbin, cutx_hsn);
472 plline(CPLOT_NREFERRHISTBIN, cuty_hsn, cutbin);
473 plwid(lwid);
474 - plcol(15);
475 + plcol0(15);
476 plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
477 sprintf(str, "Group ##%d: 2D reference astrometric errors", fgroup->no);
478 pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
479 @@ -3317,7 +3318,7 @@
480 }
481 else
482 {
483 - plcol(1);
484 + plcol0(1);
485 plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
486 "No overlapping detections!");
487 }
488 @@ -3326,36 +3327,35 @@
489 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
490 r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
491 plscmap1l(1, 2, cpoint, r, g, b, NULL);
492 - plimage(histo_hsn[d3], CPLOT_PIXERR1DNX_HSN, CPLOT_PIXERR1DNY_HSN,
493 - 0.5, maxwidth, -maxlim, maxlim,
494 - 0.5, zmax_hsn[d3],
495 - 0.5, maxwidth, -maxlim, maxlim);
496 + plimage((const PLFLT **)histo_hsn[d3], CPLOT_PIXERR1DNX_HSN,
497 + CPLOT_PIXERR1DNY_HSN, 0.5, maxwidth, -maxlim, maxlim,
498 + 0.5, zmax_hsn[d3], 0.5, maxwidth, -maxlim, maxlim);
499 }
500 sprintf(xlabel, "AXIS%d [pixels]", d2+1);
501 sprintf(ylabel, "#gDAXIS%d [pixels]", d+1);
502 plscolbg(255,255,255); /* Force the background colour to white */
503 plscol0(15, 0,0,0); /* Force the foreground colour to black */
504 /* 1D histograms */
505 - plcol(3);
506 + plcol0(3);
507 plwid(2*lwid);
508 plline(CPLOT_NPIXERRHISTBIN, cuty[d3], cutbin);
509 - plcol(7);
510 + plcol0(7);
511 plline(CPLOT_NPIXERRHISTBIN, cuty_hsn[d3], cutbin);
512 if (zmax[d3]>=1.0)
513 {
514 - plcol(15);
515 + plcol0(15);
516 for (i=0; i<CPLOT_PIXERR1DNX+1; i++)
517 if (weight[d3][i]>0.0)
518 line[d3][i] /= weight[d3][i];
519 plwid(6*lwid);
520 - plcol(15);
521 + plcol0(15);
522 plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
523 plwid(3*lwid);
524 - plcol(3);
525 + plcol0(3);
526 plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
527 }
528 plwid(lwid);
529 - plcol(15);
530 + plcol0(15);
531 plwid(lwid);
532 xl[0] = 0.5 - margin;
533 xl[1] = maxwidth;
534 @@ -3659,7 +3659,7 @@
535 }
536 else
537 {
538 - plcol(1);
539 + plcol0(1);
540 plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
541 "No overlapping detections!");
542 }
543 @@ -3668,7 +3668,7 @@
544 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
545 r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
546 plscmap1l(1, 2, cpoint, r, g, b, NULL);
547 - plimage(histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
548 + plimage((const PLFLT **)histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
549 CPLOT_SUBPIXERR1DNY_HSN,
550 -0.5, 0.5, -maxlim, maxlim,
551 0.5, zmax_hsn[d3],
552 @@ -3679,27 +3679,27 @@
553 plscolbg(255,255,255); /* Force the background colour to white */
554 plscol0(15, 0,0,0); /* Force the foreground colour to black */
555 /* 1D histograms */
556 - plcol(3);
557 + plcol0(3);
558 plwid(2*lwid);
559 plline(CPLOT_NSUBPIXERRHISTBIN, cuty[d3], cutbin);
560 - plcol(7);
561 + plcol0(7);
562 plline(CPLOT_NSUBPIXERRHISTBIN, cuty_hsn[d3], cutbin);
563 if (zmax[d3]>=1.0)
564 {
565 - plcol(15);
566 + plcol0(15);
567 for (i=0; i<CPLOT_SUBPIXERR1DNX; i++)
568 if (weight[d3][i]>0.0)
569 line[d3][i] /= weight[d3][i];
570 line[d3][CPLOT_SUBPIXERR1DNX] = line[d3][0];
571 plwid(6*lwid);
572 - plcol(15);
573 + plcol0(15);
574 plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
575 plwid(3*lwid);
576 - plcol(3);
577 + plcol0(3);
578 plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
579 }
580 plwid(lwid);
581 - plcol(15);
582 + plcol0(15);
583 plwid(lwid);
584 xl[0] = -0.5 - margin;
585 xl[1] = 0.5;
586 @@ -4012,13 +4012,14 @@
587 r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
588 r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
589 plscmap1l(1, 2, cpoint, r, g, b, NULL);
590 - plshades(histo[d], CPLOT_ASTRCOLSHIFT1DNX, CPLOT_ASTRCOLSHIFT1DNY,
591 - NULL, dmagmin, dmagmax, -maxlim, maxlim,
592 - clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
593 + plshades((const PLFLT **)histo[d], CPLOT_ASTRCOLSHIFT1DNX,
594 + CPLOT_ASTRCOLSHIFT1DNY, NULL, dmagmin, dmagmax, -maxlim,
595 + maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
596 + NULL, NULL);
597 }
598 else
599 {
600 - plcol(1);
601 + plcol0(1);
602 plptex((PLFLT)mdmag, maxlim/2.0, 1.0, 0.0, 0.5,
603 "No overlapping detections!");
604 }
605 @@ -4027,7 +4028,7 @@
606 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
607 r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
608 plscmap1l(1, 2, cpoint, r, g, b, NULL);
609 - plimage(histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
610 + plimage((const PLFLT **)histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
611 CPLOT_ASTRCOLSHIFT1DNY_HSN,
612 dmagmin, dmagmax, -maxlim, maxlim, 0.5, zmax_hsn[d],
613 dmagmin, dmagmax, -maxlim, maxlim);
614 @@ -4037,13 +4038,13 @@
615 plscolbg(255,255,255); /* Force the background colour to white */
616 plscol0(15, 0,0,0); /* Force the foreground colour to black */
617 /*------ 1D histograms */
618 - plcol(13);
619 + plcol0(13);
620 plwid(2*lwid);
621 plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
622 - plcol(7);
623 + plcol0(7);
624 plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
625 plwid(lwid);
626 - plcol(15);
627 + plcol0(15);
628 plwid(lwid);
629 xl[0] = dmagmin;
630 xl[1] = dmagmax;
631 @@ -4250,13 +4251,13 @@
632 r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
633 r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
634 plscmap1l(1, 2, cpoint, r, g, b, NULL);
635 - plshades(histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
636 + plshades((const PLFLT **)histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
637 -maxlim,maxlim, -maxlim,maxlim,
638 clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
639 }
640 else
641 {
642 - plcol(1);
643 + plcol0(1);
644 plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
645 }
646 if (zmax_hsn[d]>=1.0)
647 @@ -4264,14 +4265,13 @@
648 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
649 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
650 plscmap1l(1, 2, cpoint, r, g, b, NULL);
651 - plimage(histo_hsn[d], CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
652 - -maxlim,maxlim, -maxlim, maxlim,
653 - 0.5, zmax_hsn[d],
654 - -maxlim, maxlim, -maxlim, maxlim);
655 + plimage((const PLFLT **)histo_hsn[d], CPLOT_REFERR2DN_HSN,
656 + CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
657 + 0.5, zmax_hsn[d], -maxlim, maxlim, -maxlim, maxlim);
658 }
659 plscolbg(255,255,255); /* Force the background colour to white */
660 plscol0(15, 0,0,0); /* Force the foreground colour to black */
661 - plcol(15);
662 + plcol0(15);
663 plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
664 pllab(d?"#gm#d#gd#u(ref) [mas/yr]":"#gm#d#ga#u(ref) [mas/yr]",
665 d?"#gm#d#gd#u(SCAMP) [mas/yr]":"#gm#d#ga#u(SCAMP) [mas/yr]", "");
666 diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/photcplot.c scamp-1.7.0-r2/src/photcplot.c
667 --- scamp-1.7.0/src/photcplot.c 2009-09-10 15:11:14.000000000 +0200
668 +++ scamp-1.7.0-r2/src/photcplot.c 2012-01-01 20:55:00.358169400 +0100
669 @@ -182,7 +182,7 @@
670 /*-- Now plot! */
671 firstflag = 1;
672 yl[0] = yl[1] = 0.0;
673 - plcol(15);
674 + plcol0(15);
675 plschr(0.0,0.5);
676 lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
677 plwid(lwid);
678 @@ -204,9 +204,9 @@
679 if (fields[f]->photomlabel == instru)
680 {
681 if (fields[f]->photomflag==1)
682 - plcol(9);
683 + plcol0(9);
684 else
685 - plcol(8);
686 + plcol0(8);
687 plpoin((PLINT)1, x+n,y+n, 5);
688 plptex(x[n],y[n], 0.0, -1.0, -0.1, fields[f]->rfilename);
689 n++;
690 @@ -214,7 +214,7 @@
691 xl[0] = 0.0;
692 xl[1] = npointmax+1.0;
693 pllsty(2);
694 - plcol(15);
695 + plcol0(15);
696 plline(2, xl, yl);
697 pllsty(1);
698 firstflag = 0;
699 @@ -443,13 +443,14 @@
700 r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
701 r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
702 plscmap1l(1, 2, cpoint, r, g, b, NULL);
703 - plshades(histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
704 - fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
705 - clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
706 + plshades((const PLFLT **)histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY,
707 + NULL, fgroup->projposmin[d], fgroup->projposmax[d], -maxlim,
708 + maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
709 + NULL, NULL);
710 }
711 else
712 {
713 - plcol(1);
714 + plcol0(1);
715 plptex((fgroup->projposmin[d] - margin + fgroup->projposmax[d])/2.0,
716 maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
717 }
718 @@ -458,20 +459,20 @@
719 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
720 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
721 plscmap1l(1, 2, cpoint, r, g, b, NULL);
722 - plimage(histo_hsn[d], CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
723 - fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
724 - 0.5, zmax_hsn[d],
725 + plimage((const PLFLT **)histo_hsn[d], CPLOT_PHOTERRNX_HSN,
726 + CPLOT_PHOTERRNY_HSN, fgroup->projposmin[d],
727 + fgroup->projposmax[d], -maxlim, maxlim, 0.5, zmax_hsn[d],
728 fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim);
729 }
730 plscolbg(255,255,255); /* Force the background colour to white */
731 plscol0(15, 0,0,0); /* Force the foreground colour to black */
732 - plcol(9);
733 + plcol0(9);
734 plwid(2*lwid);
735 plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
736 - plcol(7);
737 + plcol0(7);
738 plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
739 plwid(lwid);
740 - plcol(15);
741 + plcol0(15);
742 xl[0] = fgroup->projposmin[d] - margin;
743 xl[1] = fgroup->projposmax[d];
744 pllsty(2);
745 @@ -728,13 +729,13 @@
746 r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
747 r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
748 plscmap1l(1, 2, cpoint, r, g, b, NULL);
749 - plshades(histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
750 + plshades((const PLFLT **)histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
751 xoffset, magmax, -maxlim, maxlim,
752 clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
753 }
754 else
755 {
756 - plcol(1);
757 + plcol0(1);
758 plptex((xoffset - margin + magmax)/2.0,
759 maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
760 }
761 @@ -743,20 +744,19 @@
762 r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
763 r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
764 plscmap1l(1, 2, cpoint, r, g, b, NULL);
765 - plimage(histo_hsn, CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
766 - xoffset, magmax, -maxlim, maxlim,
767 - 0.5, zmax_hsn,
768 - xoffset, magmax, -maxlim, maxlim);
769 + plimage((const PLFLT **)histo_hsn, CPLOT_PHOTERRNX_HSN,
770 + CPLOT_PHOTERRNY_HSN, xoffset, magmax, -maxlim, maxlim,
771 + 0.5, zmax_hsn, xoffset, magmax, -maxlim, maxlim);
772 }
773 plscolbg(255,255,255); /* Force the background colour to white */
774 plscol0(15, 0,0,0); /* Force the foreground colour to black */
775 - plcol(9);
776 + plcol0(9);
777 plwid(2*lwid);
778 plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
779 - plcol(7);
780 + plcol0(7);
781 plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
782 plwid(lwid);
783 - plcol(15);
784 + plcol0(15);
785 xl[0] = xoffset - margin;
786 xl[1] = magmax;
787 pllsty(2);
Report Message
Find on MARC Find on Google Groups