Commits

Takahiro Tsutsumi authored 2a74539e593 Merge
Merge branch 'master' into bugfix/CAS-11367

with Fixed Conflict gcwrap/python/scripts/tests/test_refimager.py
No tags

code/miriad/apps/carmafiller/carmafiller.cc

Modified
323 323 Vector<Double> ras_p, decs_p; // ra/dec for source list (source_p)
324 324 Vector<String> source_p, // list of source names (?? object_p ??)
325 325 purpose_p; // purpose of this source
326 326
327 327
328 328 // the following variables are for miriad, hence not Double/Int/Float
329 329 // thus the code may have to be fixed on machines where these do not
330 330 // agree ... may need special access code to get those into CASA
331 331 // types on 64 bit machines??
332 332
333 - double preamble[5], first_time;
334 - int ifield, nfield, npoint, nsource; // both dra/ddec should become Vector's
333 + double preamble[5] /*, first_time*/;
334 + int ifield, nfield, npoint /*, nsource*/ ; // both dra/ddec should become Vector's
335 335 float dra[MAXFIELD], ddec[MAXFIELD]; // offset in radians
336 336 double ra[MAXFIELD], dec[MAXFIELD];
337 337 int field[MAXFIELD]; // source index
338 338 int fcount[MAXFIELD], sid_p[MAXFIELD];
339 339 float dra_p, ddec_p;
340 340 int pol_p;
341 - char message[MAXMSG];
341 + //char message[MAXMSG];
342 342
343 343
344 344 // The following items more or less follow the uv variables in a dataset
345 345 Int nants_p, nants_offset_p, nchan_p, nwide_p, npol_p;
346 346 Double antpos[3*MAXANT];
347 347 Float phasem1[MAXANT];
348 348 Double ra_p, dec_p; // current pointing center RA,DEC at EPOCH
349 349 Float inttime_p;
350 350 Double freq_p; // rest frequency of the primary line
351 351 Int mount_p;

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut