Pull request #969: CAS-14618
Merge in CASA/casa6 from CAS-14618 to master
* commit 'bff3104176274fdbb6c048033a4c5f96c7218f82':
Fix some more unwarranted image comparisons...with restart
SIImagestore is a bit too smart for its own good. Usually if it finds any file from psf to gridwt on disk it decides that is the shape it will use. Now multi stokes and per field briggs weight will have a weight density which have different shapes than the image product...On first start there is no images..we calculate the gridwt which may have pol and a per field axis...i.e after distributing it to the worker processes i moved it to gridwt_temp ...so as to hide it from SIImageStore smartness when it is going to make psf etc...and that works on the first run...on restart now psf, residual etc exists but it will try to make a gridwt again which may be different...hence the error. The fix is to detect it is a restart..then just distribute the already calculated gridwt...and bypass trying to make it again thus avoiding the comparison of shapes
Pull request #970: CAS-14594
Merge in CASA/casa6 from CAS-14594 to master
* commit 'fbfb4546fdd7d52155540be6b99d7eca4c83caf2':
changed deprecated Constants values found in comments and in templated code not being used
fixed incorrect edit involving C::_2pi to (2.0*M_PI)
fixed incorrect edit involving C::pi to M_PI CAS-14594 - clean up deprecated warnings from C:: constants
