casa / casa6 / a7c03fd081b

Commits

Ville Suoranta authored a7c03fd081b Merge 17 May 2021

Merge pull request #374 in CASA/casa6 from CAS-13438 to master

* commit '51107a7467a28de68bb132213152209a9016731b':
  CAS-13438 : Added 1 test and modified one.
  CAS-13438 : Fixed what got broken in cas-13211 and which showed up in cas-13421. Enabled 3 tests that got skipped in cas-13420 and which were waiting for cas-13421.

casa5/code/synthesis/ImagerObjects/SIImageStore.cc

Modified

-184
+    itsImageShape = imshape;
-185
+    itsObjectName = objectname;
-186
+    itsMiscInfo = miscinfo;
-187
-188
+    init();
-189
-190
+    validate();
-191
+  }
-192
-193
+  // Used from SynthesisNormalizer::makeImageStore()
--
+  SIImageStore::SIImageStore(const String &imagename, const Bool ignorefacets)
-+
+  SIImageStore::SIImageStore(const String &imagename, const Bool ignorefacets, const Bool ignoresumwt)
-195
+  {
-196
+    LogIO os( LogOrigin("SIImageStore","Open existing Images",WHERE) );
-197
-198
-199
+    itsPsf.reset( );
-200
+    itsModel.reset( );
-201
+    itsResidual.reset( );
-202
+    itsWeight.reset( );
-203
+    itsImage.reset( );
-204
+    itsMask.reset( );
-279
+	    /////redo this here as psf may have different coordinates
-280
+	    itsCoordSys = imptr->coordinates();
-281
+	    itsMiscInfo=imptr->miscInfo();
-282
+	    if( itsUseWeight && ! doesImageExist(itsImageName+String(".weight")) )
-283
+	      {
-284
+		throw(AipsError("Internal error : Sumwt has a useweightimage=True but the weight image does not exist."));
-285
+	      }
-286
+	  }
-287
+	else
-288
+	  {
--
+	    //throw( AipsError( "SumWt information does not exist. Please create either a PSF or Residual" ) );
--
+	    std::shared_ptr<ImageInterface<Float> > imptr;
--
+	    //imptr.reset( new PagedImage<Float> (itsImageName+String(".sumwt")) );
--
+	    if( doesImageExist(itsImageName+String(".residual") ) )
--
+	      { buildImage( imptr, (itsImageName+String(".residual")) ); }
--
+	      else
--
+	      { buildImage( imptr, (itsImageName+String(".psf")) ); }
--
--
+	    itsNFacets=1;
--
+	    itsFacetId=0;
--
+	    itsUseWeight=0;
--
+	    itsPBScaleFactor=1.0;
--
+	    itsCoordSys = imptr->coordinates();
--
+	    itsMiscInfo=imptr->miscInfo();
-+
+	    if(!ignoresumwt)
-+
+	      {throw( AipsError( "SumWt information does not exist. Please create either a PSF or Residual" ) );}
-+
+	    else
-+
+	      {
-+
+		os << "SumWt does not exist. Proceeding only with PSF" << LogIO::POST;
-+
+		std::shared_ptr<ImageInterface<Float> > imptr;
-+
+		//imptr.reset( new PagedImage<Float> (itsImageName+String(".sumwt")) );
-+
+		if( doesImageExist(itsImageName+String(".residual") ) )
-+
+		  { buildImage( imptr, (itsImageName+String(".residual")) ); }
-+
+		else
-+
+		  { buildImage( imptr, (itsImageName+String(".psf")) ); }
-+
-+
+		itsNFacets=1;
-+
+		itsFacetId=0;
-+
+		itsUseWeight=False;
-+
+		itsPBScaleFactor=1.0;
-+
+		itsCoordSys = imptr->coordinates();
-+
+		itsMiscInfo=imptr->miscInfo();
-+
+	      }
-308
+	  }
--
-309
+      }// if psf or residual exist...
-310
-311
+    if( ignorefacets==True ) itsNFacets= 1;
-312
-313
+    init();
-314
-315
+    validate();
-316
+  }
-317
-318
+  // used from getSubImageStore(), for example when creating the facets list

casa6

Commits

Jira Issues

Add shortcut