casa / casa6 / 942d8c5089d

Commits

Federico Montesino Pouzols authored 942d8c5089d 24 Nov 2021

WIP - more code cleanup, CAS-13649

casatools/src/code/mstransform/TVI/UVContSubTVI.cc

Modified

-238
-239
+	exists = -1;
-240
+	exists = configuration.fieldNumber ("denoising_lib");
-241
+	if (exists >= 0)
-242
+	{
-243
+		configuration.get (exists, withDenoisingLib_p);
-244
-245
+		if (withDenoisingLib_p)
-246
+		{
-247
+			logger_p 	<< LogIO::NORMAL << LogOrigin("UVContSubTVI", __FUNCTION__)
--
+						<< "Using denoising lib (GSL based)" << LogIO::POST;
-+
+						<< "Using GSL based multiparameter regression with linear least-squares fitting" << LogIO::POST;
-249
+		}
-250
+	}
-251
-252
+	exists = -1;
-253
+	exists = configuration.fieldNumber ("nthreads");
-254
+	if (exists >= 0)
-255
+	{
-256
+		configuration.get (exists, nThreads_p);
-257
-258
+		if (nThreads_p > 1)
-298
+	return ret;
-299
+}
-300
-301
+// -----------------------------------------------------------------------
-302
+//
-303
+// -----------------------------------------------------------------------
-304
+void UVContSubTVI::initialize()
-305
+{
-306
+    // Populate nchan input-output maps
-307
+    uInt spw_idx = 0;
--
+    for(auto spwInp: spwInpChanIdxMap_p)
-+
+    for (auto spwInp: spwInpChanIdxMap_p)
-309
+    {
-310
+        auto spw = spwInp.first;
-311
+        spwOutChanNumMap_p[spw] = spwInp.second.size();
-312
+        spw_idx++;
-313
+    }
-314
-315
+    // Process line-free channel selection
-316
+    for (const auto item: fitspw_p) {
-317
+        unordered_map<int, Vector<Bool> > lineFreeChannelMaskMap;
-318
+        // Parse line-free channel selection using MSSelection syntax
-319
+        const auto fieldID = item.first;
--
+        auto fieldFitspw = item.second;
-+
+        const auto fieldFitspw = item.second;
-321
-322
+        logger_p << LogIO::NORMAL << LogOrigin("UVContSubTVI", __FUNCTION__)
-323
+                 << "Parsing fitspw string for field: " << fieldNameFromId(fieldID)
-324
+                 << ", fitspw: '" << fieldFitspw << "'" << LogIO::POST;
-325
-326
+        if ("NONE" == fieldFitspw) {
-327
+            // Not inserting any entries in perFieldLineFreeChannelMaskMap_p[fieldID]
-328
+            // implies no transformation for that field (inputVis -> outputVis)
-329
+            continue;
-330
+        }
-331
-332
+        if (fieldFitspw.empty()) {
-333
+            // -1 is the "all-fields-included" field pseudo-index
-334
+            // empty selection -> all SPW, channels, leave all SPW masks unset
-335
+            if (-1 == fieldID) {
--
+                perFieldLineFreeChannelMaskMap_p.insert(std::make_pair(fieldID, lineFreeChannelMaskMap));
-+
+                perFieldLineFreeChannelMaskMap_p.emplace(fieldID, lineFreeChannelMaskMap);
-337
+            }
-338
+            continue;
-339
+        }
-340
-341
+        // Some selection string
-342
+        MSSelection mssel;
-343
+        mssel.setSpwExpr(fieldFitspw);
--
+        Matrix<Int> spwchan = mssel.getChanList(&(inputVii_p->ms()));
-+
+        const auto spwchan = mssel.getChanList(&(inputVii_p->ms()));
-345
--
+        // Create line-free channel map
--
+        uInt nSelections = spwchan.shape()[0];
--
+        map<Int,vector<Int> > lineFreeChannelMap;
--
+        Int channelStart,channelStop,channelStep;
--
+        for(uInt selection_i=0; selection_i<nSelections; ++selection_i)
-+
+        // Create line-free channel map based on MSSelection channel ranges
-+
+        const auto nSelections = spwchan.shape()[0];
-+
+        unordered_map<Int,vector<Int> > lineFreeChannelMap;
-+
+        for (uInt selection_i=0; selection_i<nSelections; ++selection_i)
-350
+        {
-351
+            auto spw = spwchan(selection_i,0);
--
+            channelStart = spwchan(selection_i,1);
--
+            channelStop = spwchan(selection_i,2);
--
+            channelStep = spwchan(selection_i,3);
-352
+            if (lineFreeChannelMap.find(spw) == lineFreeChannelMap.end())
-353
+            {
-354
+                lineFreeChannelMap[spw].clear(); // Accessing the vector creates it
-355
+            }
-356
--
+            for (Int inpChan=channelStart;inpChan<=channelStop;inpChan += channelStep)
-+
+            const auto channelStart = spwchan(selection_i,1);
-+
+            const auto channelStop = spwchan(selection_i,2);
-+
+            const auto channelStep = spwchan(selection_i,3);
-+
+            for (auto inpChan=channelStart; inpChan<=channelStop; inpChan += channelStep)
-361
+            {
-362
+                lineFreeChannelMap[spw].push_back(inpChan);
-363
+            }
-364
+        }
-365
-366
+        // Create line-free channel mask
--
+        uInt selChan;
--
+        for(auto const spwInp: spwInpChanIdxMap_p)
-+
+        for (auto const spwInp: spwInpChanIdxMap_p)
-368
+        {
--
+            auto spw = spwInp.first;
-+
+            const auto spw = spwInp.first;
-370
+            if (lineFreeChannelMaskMap.find(spw) == lineFreeChannelMaskMap.end())
-371
+            {
-372
+                lineFreeChannelMaskMap[spw] = Vector<Bool>(spwInp.second.size(),True);
-373
+                for (uInt selChanIdx=0; selChanIdx<lineFreeChannelMap[spw].size();
-374
+                     ++selChanIdx)
-375
+                {
--
+                    selChan = lineFreeChannelMap[spw][selChanIdx];
-+
+                    const auto selChan = lineFreeChannelMap[spw][selChanIdx];
-377
+                    lineFreeChannelMaskMap[spw](selChan) = False;
-378
+                }
-379
+            }
-380
+            spw_idx++;
-381
+        }
-382
-383
+        perFieldLineFreeChannelMaskMap_p.emplace(fieldID, lineFreeChannelMaskMap);
-384
+    }
-385
+}
-386

casa6

Commits

Jira Issues

Add shortcut