casa / casa6 / 8addd6408f8

Commits

Kumar Golap authored 8addd6408f8 06 Feb 2025

Fix an edge-case  bug that prevented vlass_stk to run without failing in parallel

9d1c2cd2e65

master

Download source

casatools/src/code/synthesis/ImagerObjects/SynthesisNormalizer.cc

Modified

-295
+    Vector<Float> f2part(f2out.nelements(), 0.0);
-296
+    bool recalcF2 = (d2out.nelements() >0 && d2out[0] == 1.0); // need to recalculate F2 for normalized Briggs
-297
+    if(recalcF2)
-298
+      f2out.set(0.0);
-299
+    Int nxim = itsImages->gridwt()->shape()(0);
-300
+    Int nyim = itsImages->gridwt()->shape()(1);
-301
+    for (uInt part = 0; part < itsPartImages.nelements(); part++) {
-302
+      itsImages->addImages(itsPartImages[part], false,
-303
+                           /*residual*/ false, /*weight*/ false,
-304
+                           /*griddedwt*/ true);
-+
+      Record partiminfo(itsPartImages[part]->gridwt()->miscInfo());
-+
+      mergeWeightDensityInfo(iminfo, partiminfo);
-307
+      if (recalcF2) {
-308
+        Vector<Float> f2in;
-309
+        (itsPartImages[part]->gridwt()->miscInfo()).get("f2", f2in);
-310
+        Array<Float> arr;
-311
+        if (d2out.nelements() > 1) {
-312
+          IPosition blc(5, 0, 0, 0, 0, 0);
-313
+          IPosition shp(5, nxim, nyim, 1, 1, 1);
-314
+          for (uInt k = 0; k < d2out.nelements(); ++k) {
-315
+            blc[4] = k;
-316
+            itsPartImages[part]->gridwt()->getSlice(arr, blc, shp, True);
-338
+            f2out[k] = f2out[k] / sumarr2;
-339
+        }
-340
+      }
-341
+      else{
-342
+        itsImages->gridwt()->get(arr, True);
-343
+        Float sumarr2 = sum(arr * arr);
-344
+        if (sumarr2 > 0)
-345
+          f2out[0] = f2out[0] / sumarr2;
-346
+      }
-347
+      iminfo.define("f2", f2out);
--
+      itsImages->gridwt()->setMiscInfo(iminfo);
-+
-349
+    }
--
-+
+    itsImages->gridwt()->setMiscInfo(iminfo);
-+
-352
+  } // end of image gathering.
-353
-354
+  // Normalize by the weight image.
-355
+  //    divideResidualByWeight();
-356
+  itsImages->releaseLocks();
-357
-358
+}//end of gatherweightdensity
-359
-360
+//-------------------------
-361
-433
-434
-435
+  void SynthesisNormalizer::divideWeightBySumWt() {
-436
-437
+    LogIO os(LogOrigin("SynthesisNormalizer", "divideWeightBySumWt", WHERE));
-438
+    itsImages->divideWeightBySumwt();
-439
-440
+  }
-441
-442
--
-443
-444
+  void SynthesisNormalizer::dividePSFByWeight()
--
-445
+  {
-446
+    LogIO os( LogOrigin("SynthesisNormalizer", "dividePSFByWeight",WHERE) );
-447
+    {
-448
-449
+      LatticeLocker lock1 (*(itsImages->psf()), FileLocker::Write);
-450
-451
+      if( itsNFacets==1) {
-452
+        itsImages->dividePSFByWeight(itsPBLimit);
-453
+      }
-454
+      else {
-815
+	    Slicer sl(blc, trc, Slicer::endIsLast);
-816
+	    SubImage<Float> sub(*(itsImages->psf(tix)), sl, true);
-817
+	    sub.copyData(onepsf);
-818
+	  }
-819
+      }
-820
-821
+      //      cout << "In setPsfFromOneFacet : sumwt : " << itsImages->sumwt()->get() << endl;
-822
-823
+   }
-824
--
-+
+   void SynthesisNormalizer::mergeWeightDensityInfo(Record& outinfo, const Record& partinfo){
-+
+     uInt mapsize;
-+
+     outinfo.get("multimapsize", mapsize);
-+
+     uInt partsize;
-+
+     partinfo.get("multimapsize", partsize);
-+
+     std::vector<String> key2add;
-+
+     std::vector<Int> val2add;
-+
+     for (uInt k = 0; k < partsize; ++k){
-+
+      String key;
-+
+      partinfo.get("key" + String::toString(k), key);
-+
+      Bool hasKey = False;
-+
+      for (uInt j = 0; j < mapsize; ++j) {
-+
+        String imkey;
-+
+        outinfo.get("key" + String::toString(j), imkey);
-+
+        hasKey = hasKey || (imkey == key);
-+
+      }
-+
+      if (!hasKey) {
-+
+          key2add.push_back(key);
-+
+          Int val;
-+
+          partinfo.get("val" + String::toString(k), val);
-+
+          val2add.push_back(val);
-+
+        }
-+
+       }
-+
+     if (key2add.size() > 0) {
-+
+       for (uInt k = mapsize; k < (mapsize + key2add.size()); ++k) {
-+
+         String key = "key" + String::toString(k);
-+
+        outinfo.define(key, key2add[k - mapsize]);
-+
+        String val = "val" + String::toString(k);
-+
+        outinfo.define(val, val2add[k - mapsize]);
-+
+      }
-+
+      mapsize += key2add.size();
-+
+      outinfo.define("multimapsize", mapsize);
-+
+     }
-+
+   }
-859
-860
+} //# NAMESPACE CASA - END
-861

casa6

Commits

Jira Issues

Add shortcut