casa / casa6 / 6a89d3f7ab9

Commits

Pam Harris authored 6a89d3f7ab9 03 Jun 2022

Remove tabs

Tags

CAS-13823-2

9e2c1e68a60

master

Download source

casatools/src/tools/ms/ms_cmpt.cc

Modified

-817
+            casacore::MSFieldColumns msfc(itsMS->field());
-818
+            casacore::MDirection d;
-819
+            if(colname=="DELAY_DIR"){
-820
+                d = msfc.delayDirMeas(fieldid, time);
-821
+            }
-822
+            else if(colname=="PHASE_DIR"){
-823
+                d = msfc.phaseDirMeas(fieldid, time);
-824
+            }
-825
+            else if(colname=="REFERENCE_DIR"){
-826
+                d = msfc.referenceDirMeas(fieldid, time);
--
+	    }
-+
+            }
-828
+            else if(colname=="EPHEMERIS_DIR"){
-829
+                d = msfc.ephemerisDirMeas(fieldid, time);
-830
+            }
-831
+            else{
-832
+                *itsLog << LogIO::SEVERE
-833
+                        << "Illegal FIELD direction column name: " << dircolname
-834
+                        << LogIO::POST;
-835
+            }
-836
+            String f(format);
-837
+            f.downcase();
-2310
+        Table::relinquishAutoLocks(True);
-2311
+        RETHROW(x);
-2312
+    }
-2313
+    Table::relinquishAutoLocks(True);
-2314
+    return retval;
-2315
+}
-2316
-2317
+bool
-2318
+ms::selectinit(const long datadescid, const bool resetsel)
-2319
+{
--
+	*itsLog << LogOrigin("ms", "selectinit");
--
+	Bool retval = false;
--
+	try {
--
+		Vector<Int> ddId(1, datadescid);
--
+		if(!detached()){
--
+			Int n=ddId.nelements();
--
+			if (n>0 && min(ddId)<0 && !resetsel) {
--
+				*itsLog << "The data description id must be a list of "
--
+					"positive integers" << LogIO::EXCEPTION;
--
+			}
--
+			if (resetsel) {
--
+				retval = reset();
--
+				initSel_p = false;
--
+			} else {
--
+				String selDDID = String::toString(datadescid);
--
+				String ddidTaql = "DATA_DESC_ID IN [" + selDDID + "]";
--
+				Record taqlSelRec(Record::Variable);
--
+				taqlSelRec.define("taql", ddidTaql);
--
+				std::unique_ptr<::casac::record> casacRec(fromRecord(taqlSelRec));
--
+				try {
--
+					// test it first, can't revert MSSelection selection
--
+					retval = doMSSelection(*casacRec, true);  // onlyparse=true
--
+					if (retval)
--
+						retval = doMSSelection(*casacRec); // onlyparse=false
--
+					initSel_p = retval;
--
+				} catch (const AipsError &x) {  // MSSelectionNullSelection
--
+					String mesg = "selectinit failed for datadescid " + selDDID;
--
+					*itsLog << LogOrigin("ms", "selectinit");
--
+					*itsLog << LogIO::WARN << mesg << LogIO::POST;
--
+					retval = initSel_p = false;
--
+				}
--
+			}
--
+		}
--
+	} catch (AipsError x) {
--
+		*itsLog << LogOrigin("ms", "selectinit");
--
+		*itsLog << LogIO::SEVERE << "Exception Reported: " << x.getMesg() << LogIO::POST;
--
+		Table::relinquishAutoLocks(true);
--
+		RETHROW(x);
--
+	}
--
+	Table::relinquishAutoLocks(true);
--
+	return retval;
-+
+    *itsLog << LogOrigin("ms", "selectinit");
-+
+    Bool retval = false;
-+
+    try {
-+
+        Vector<Int> ddId(1, datadescid);
-+
+        if(!detached()){
-+
+            Int n=ddId.nelements();
-+
+            if (n>0 && min(ddId)<0 && !resetsel) {
-+
+                *itsLog
-+
+                    << "The data description id must be a list of positive integers"
-+
+                    << LogIO::EXCEPTION;
-+
+            }
-+
+            if (resetsel) {
-+
+                retval = reset();
-+
+                initSel_p = false;
-+
+            } else {
-+
+                String selDDID = String::toString(datadescid);
-+
+                String ddidTaql = "DATA_DESC_ID IN [" + selDDID + "]";
-+
+                Record taqlSelRec(Record::Variable);
-+
+                taqlSelRec.define("taql", ddidTaql);
-+
+                std::unique_ptr<::casac::record> casacRec(fromRecord(taqlSelRec));
-+
+                try {
-+
+                    // test it first, can't revert MSSelection selection
-+
+                    retval = doMSSelection(*casacRec, true);  // onlyparse=true
-+
+                    if (retval)
-+
+                        retval = doMSSelection(*casacRec); // onlyparse=false
-+
+                    initSel_p = retval;
-+
+                } catch (const AipsError &x) {  // MSSelectionNullSelection
-+
+                    String mesg = "selectinit failed for datadescid " + selDDID;
-+
+                    *itsLog << LogOrigin("ms", "selectinit");
-+
+                    *itsLog << LogIO::WARN << mesg << LogIO::POST;
-+
+                    retval = initSel_p = false;
-+
+                }
-+
+            }
-+
+        }
-+
+    } catch (AipsError x) {
-+
+        *itsLog << LogOrigin("ms", "selectinit");
-+
+        *itsLog << LogIO::SEVERE << "Exception Reported: " << x.getMesg() << LogIO::POST;
-+
+        Table::relinquishAutoLocks(true);
-+
+        RETHROW(x);
-+
+    }
-+
+    Table::relinquishAutoLocks(true);
-+
+    return retval;
-2362
+}
-2363
-2364
+bool
-2365
+ms::selectold(const ::casac::record& items)
-2366
+{
-2367
+    *itsLog << LogOrigin("ms", "selectold");
-2368
+    *itsLog << LogIO::WARN
-2369
+            << "The use of ms::selectold() is deprecated; this function "
-2370
+            << "will be removed from CASA in a future version. "
-2371
+            << "Calls to ms::selectold() should be replaced by calls to "
-2383
+        Table::relinquishAutoLocks(True);
-2384
+        RETHROW(x);
-2385
+    }
-2386
+    Table::relinquishAutoLocks(True);
-2387
+    return retval;
-2388
+}
-2389
-2390
+bool
-2391
+ms::select(const ::casac::record& items)
-2392
+{
--
+	*itsLog << LogOrigin("ms", "select");
-2393
+    // Use selecttaql and doMSSelection for these selections
--
+	Bool retval = true;
--
+	try {
--
+		if(!detached()){
-+
+    *itsLog << LogOrigin("ms", "select");
-+
+    Bool retval = true;
-+
+    try {
-+
+        if(!detached()){
-2398
+            if (checkinit()) {
-2399
+              *itsLog << LogOrigin("ms", "select");
-2400
+              std::unique_ptr<Record> selRecord(toRecord(items));
-2401
+              for (uInt field=0; field < selRecord->nfields(); ++field) {
-2402
+                String fieldStr = selRecord->name(field);
-2403
+                fieldStr.upcase();
-2404
+                if (fieldStr=="ANTENNA1" ||
-2405
+                    fieldStr=="ANTENNA2" ||
-2406
+                    fieldStr=="ARRAY_ID" ||
-2407
+                    fieldStr=="FEED1" ||
-2482
+                    String column = MS::columnName(MS::TIME);
-2483
+                    Vector<Double> time = selRecord->asArrayDouble(RecordFieldId(field));
-2484
+                    MeasurementSet selms = (*itsSelectedMS)((itsSelectedMS->col(column)).in(time));
-2485
+                    *itsSelectedMS = selms;
-2486
+                    if (nrow(true)==0) {
-2487
+                        *itsLog << LogIO::WARN << "Zero rows selected; input precision may be too small to select times exactly.  Reset selection and select time range with {'time':[start,stop]} instead" << LogIO::POST;
-2488
+                    }
-2489
+                }
-2490
+                else
-2491
+                  *itsLog << LogIO::WARN << "Unrecognized field in input ignored: "+fieldStr << LogIO::POST;
--
--
+              }
--
+		  }
--
+        }
--
+	} catch (AipsError x) {
--
+		Table::relinquishAutoLocks(true);
--
+		RETHROW(x);
--
+	}
--
+	Table::relinquishAutoLocks(true);
--
+	return retval;
-+
+                }
-+
+            }
-+
+        }
-+
+    } catch (AipsError x) {
-+
+        Table::relinquishAutoLocks(true);
-+
+        RETHROW(x);
-+
+    }
-+
+    Table::relinquishAutoLocks(true);
-+
+    return retval;
-2501
+}
-2502
-2503
+bool
-2504
+ms::selecttaqlold(const std::string& msselect)
-2505
+{
-2506
+    *itsLog << LogOrigin("ms", "selecttaqlold");
-2507
+    *itsLog << LogIO::WARN
-2508
+            << "The use of ms::selecttaqlold() is deprecated; this function "
-2509
+            << "will be removed from CASA in a future version. "
-2510
+            << "Calls to ms::selecttaqlold() should be replaced by calls to "
-2530
+    *itsLog << LogOrigin("ms", "selecttaql");
-2531
+    Bool retval(false);
-2532
+    try {
-2533
+        if(!detached()) {
-2534
+            Record taqlSelRec(Record::Variable);
-2535
+            String taqlExpr = String::toString(taqlstr);
-2536
+            taqlSelRec.define("taql", taqlExpr);
-2537
+            std::unique_ptr<::casac::record> casacRec(fromRecord(taqlSelRec));
-2538
+            retval = doMSSelection(*casacRec);
-2539
+        }
--
+	} catch (AipsError x) {
--
+    	*itsLog << LogOrigin("ms", "selecttaql");
--
+		if (x.getMesg().contains("zero rows")) {
--
+			*itsLog << LogIO::WARN << x.getMesg() << LogIO::POST;
--
+		} else {
--
+			*itsLog << LogIO::SEVERE << "Exception Reported: " << x.getMesg() << LogIO::POST;
--
+			Table::relinquishAutoLocks(true);
--
+			RETHROW(x);
--
+		}
--
+	}
--
+	Table::relinquishAutoLocks(true);
--
+	return retval;
-+
+    }
-+
+    catch (AipsError x) {
-+
+        *itsLog << LogOrigin("ms", "selecttaql");
-+
+        if (x.getMesg().contains("zero rows")) {
-+
+            *itsLog << LogIO::WARN << x.getMesg() << LogIO::POST;
-+
+        } else {
-+
+            *itsLog << LogIO::SEVERE << "Exception Reported: " << x.getMesg() << LogIO::POST;
-+
+            Table::relinquishAutoLocks(true);
-+
+            RETHROW(x);
-+
+        }
-+
+    }
-+
-+
+    Table::relinquishAutoLocks(true);
-+
+    return retval;
-2554
+}
-2555
-2556
+bool
-2557
+ms::selectchannelold(const long nchan, const long start, const long width,
-2558
+        const long inc)
-2559
+{
-2560
+    *itsLog << LogOrigin("ms", "selectchannelold");
-2561
+    *itsLog << LogIO::WARN
-2562
+            << "The use of ms::selectchannelold() is deprecated; this function "
-2563
+            << "will be removed from CASA in a future version. "
-6972
+        String spwExpr, timeExpr, fieldExpr, baselineExpr, scanExpr, scanIntentExpr,
-6973
+            polnExpr, uvDistExpr, obsExpr, arrayExpr, taQLExpr;
-6974
+        Int nFields = casaRec->nfields();
-6975
-6976
+        for (Int i=0; i<nFields; i++)
-6977
+        {
-6978
+            auto name = casaRec->name(i);
-6979
+            if (name == "spw") {
-6980
+                spwExpr        = casaRec->asString(RecordFieldId(i));
-6981
+            }
--
+			else if (name == "time") {
-+
+            else if (name == "time") {
-6983
+                timeExpr       = casaRec->asString(RecordFieldId(i));
-6984
+            }
--
+			else if (name == "field") {
-+
+            else if (name == "field") {
-6986
+                fieldExpr      = casaRec->asString(RecordFieldId(i));
-6987
+            }
--
+			else if (name == "baseline") {
-+
+            else if (name == "baseline") {
-6989
+                baselineExpr   = casaRec->asString(RecordFieldId(i));
-6990
+            }
--
+			else if (name == "antenna") {
-+
+            else if (name == "antenna") {
-6992
+                baselineExpr   = casaRec->asString(RecordFieldId(i));
-6993
+            }
--
+			else if (name == "scan") {
-+
+            else if (name == "scan") {
-6995
+                scanExpr       = casaRec->asString(RecordFieldId(i));
-6996
+            }
--
+			else if (name == "scanintent") {
-+
+            else if (name == "scanintent") {
-6998
+                scanIntentExpr = casaRec->asString(RecordFieldId(i));
-6999
+            }
-7000
+            else if (name == "state") {
-7001
+                scanIntentExpr = casaRec->asString(RecordFieldId(i));
-7002
+            }
-7003
+            else if (name == "polarization") {
-7004
+                polnExpr       = casaRec->asString(RecordFieldId(i));
-7005
+            }
-7006
+            else if (name == "uvdist") {
-7007
+                uvDistExpr     = casaRec->asString(RecordFieldId(i));

casa6

Commits

Jira Issues

Add shortcut