casa / casa6 / 528267faf71

Commits

Kumar Golap authored and Ville Suoranta committed 528267faf71 Merge 24 Oct 2022

Pull request #647: CAS-13942

Merge in CASA/casa6 from CAS-13942 to master

* commit '0f0d268ecb647e18fcc4e994cbe0813fa1ab3fa5':
  make the behavior for 2 sided shapes as before when using flux instead of sample. This fix some failures in test_simobserve
  Implemented reviewer's suggestions + some cleanup
  Fixed a problem arising from SkyComponent::flux returning a fixed number when spectralModel is of the varying kind. Now used the SkyComponent::sample method

casatools/src/code/synthesis/TransformMachines/BeamSkyJones.cc

Modified

-36
+#include <casacore/tables/Tables.h>
-37
+#include <casacore/measures/Measures/Stokes.h>
-38
+#include <casacore/measures/Measures/MeasConvert.h>
-39
-40
+#include <casacore/casa/BasicSL/Constants.h>
-41
+#include <casacore/measures/Measures/MeasTable.h>
-42
+#include <components/ComponentModels/Flux.h>
-43
+#include <components/ComponentModels/ComponentShape.h>
-44
+#include <components/ComponentModels/TabularSpectrum.h>
-45
+#include <components/ComponentModels/ConstantSpectrum.h>
-+
+#include <components/ComponentModels/PointShape.h>
-47
+#include <synthesis/TransformMachines/BeamSkyJones.h>
-48
+#include <synthesis/TransformMachines/PBMath.h>
-49
-50
+#include <msvis/MSVis/VisBuffer.h>
-51
-52
+#include <casacore/images/Images/ImageInterface.h>
-53
+#include <casacore/images/Regions/ImageRegion.h>
-54
-55
+#include <casacore/casa/Utilities/Assert.h>
-56
-478
+	else{
-479
+	  //Damn people call this with in==out
-480
+	  //out=in.copy();
-481
+	  uInt nchan=vb.frequency().nelements();
-482
+	  Vector<Flux<Double> > vals(nchan, Flux<Double>(0.0));
-483
+	  Vector<MVFrequency> fs(nchan);
-484
-485
+	   Vector<Double> freqs(nchan);
-486
+	   Bool conv;
-487
+	   SkyComponent tmp;
-+
+           Vector<DComplex> normFactor;
-+
+           normFactor.assign(in.flux().value());
-+
+           auto poltype=in.flux().pol();
-+
+           for(size_t k=0; k < normFactor.size(); ++k) {
-+
+             normFactor[k]= abs(normFactor[k]) >0.0 ? 1.0/abs(normFactor[k]) : 1.0;
-+
+           }
-494
+	   vb.lsrFrequency(vb.spectralWindow(), freqs,  conv);
--
+	   for (uInt k=0; k < nchan; ++k){
--
+	     tmp=in.copy();
--
+	     myPBMath.applyPB(in, tmp, convertDir(vb, lastDirections_p[lastUpdateIndex1_p], dirType),
--
+			      Quantity(vb.frequency()(k), "Hz"),
--
+			      lastParallacticAngles_p[lastUpdateIndex1_p],
--
+			      doSquint_p, False, threshold(), forward);
--
+	     vals[k]=tmp.flux();
--
+	     //	     cerr << "freq " << freqs(k) << " flux " << vals[k].value() << endl;
--
+	     fs[k]=MVFrequency(Quantity(freqs(k), "Hz"));
-+
+	   for (uInt k=0; k < nchan; ++k)
-+
+             {
-+
+               tmp=in.copy();
-+
+               PointShape ptshape(in.shape().refDirection());
-+
+               //Assuming 2 sided shape are small compared to beam otherwise
-+
+               // we need to know the pixel size
-+
+               tmp.setShape(ptshape);
-+
+               MVAngle res(Quantity(1, "mas"));
-+
+               auto multFactor=normFactor*(tmp.sample(in.shape().refDirection(), res, res,
-+
+                                                     MFrequency(Quantity(vb.frequency()(k), "Hz"))).value()
-+
+                                           );
-+
-+
+               myPBMath.applyPB(in, tmp,
-+
+                                convertDir(vb,lastDirections_p[lastUpdateIndex1_p], dirType),
-+
+                                Quantity(vb.frequency()(k), "Hz"),
-+
+                                lastParallacticAngles_p[lastUpdateIndex1_p],
-+
+                                doSquint_p, False, threshold(), forward
-+
+                                );
-+
+               Flux<Double> tmpFlux=tmp.flux();
-+
+               tmpFlux.convertPol(poltype);
-+
+               tmpFlux.setValue(tmpFlux.value()*multFactor);
-+
+               vals[k]=tmpFlux;
-+
+               fs[k]=MVFrequency(Quantity(freqs(k), "Hz"));
-518
-519
+	   }
-520
+	   CountedPtr<SpectralModel> spModel;
-521
+	   if(fs.nelements() >1){
-522
+	     spModel=new TabularSpectrum();
-523
+	     static_cast<TabularSpectrum *>(spModel.get())->setValues(fs, vals, MFrequency::Ref(MFrequency::LSRK));
-524
+	   }
-525
+	   else{
-526
+	      spModel=new ConstantSpectrum();
-527
+	   }

casa6

Commits

Jira Issues

Add shortcut