casa / casa6 / 8b7de024da3

Commits

Dirk Petry authored and Ville Suoranta committed 8b7de024da3 Merge 09 Sep 2022

Pull request #629: CAS-13194

Merge in CASA/casa6 from CAS-13194 to master

* commit '76157a406050f469c9229e4ef158268bbe53609b':
  CAS-13194: replaced tab by spaces as requested by Enrique
  Changed the dataset used in the settrop test
  CAS-13194: fix for numerical accuracy problem in checking whether provided interval setting is too small
  modified settrop test case and added data to the repo
  Added new tests for phase angle jump at 10s
  CAS-13194: added code to set the phase screen time granularity to the old default value of 10 s in case the user does not provide a value explicitly.
  CAS-13194: reduced minimum phase screen time granularity to 0.1 s   and added warning log message in case the request is below the minimum.
  CAS-13194: added the simint parameter to sm.settrop() (default -1 = previous behaviour). The simint parameter sets the "interval" parameter in setSolve.

casatools/src/code/synthesis/MeasurementComponents/StandardVisCal.cc

Modified

-577
+      } else {
-578
+	throw(AipsError("start/stop time not defined"));
-579
+      }
-580
+      if (simpar.isDefined("stopTime")) {
-581
+	corruptor_p->stopTime() = simpar.asDouble("stopTime");
-582
+      } else {
-583
+	throw(AipsError("start/stop time not defined"));
-584
+      }
-585
-586
+      // RI todo T::createCorr make min screen granularity a user parameter
--
+      Float fBM_interval=max(interval(),10.); // generate screens on >10s intervals
--
+      if (prtlev()>2) cout<<"set fBM_interval"<<" to "<<fBM_interval<<" startTime="<<corruptor_p->startTime()<<" stopTime="<<corruptor_p->stopTime()<<endl;
-+
+      Float minFBM_interval = 0.1; // generate screens on >0.1s intervals
-+
+      Float defaultFBM_interval = 10.;
-+
+      Float fBM_interval=max(interval(), minFBM_interval);
-+
+      if (interval() <= 0.){ // use default value
-+
+	fBM_interval = defaultFBM_interval;
-+
+      } else if ( (fBM_interval - interval()) > 1E-5 ){
-+
+	os << LogIO::WARN << " Requested phase screen time granularity (" << interval()
-+
+	   << " s) is too small! Will use the minimum permitted value: " << minFBM_interval << " s." <<  LogIO::POST;
-+
+      }
-596
-597
+      corruptor_p->setEvenSlots(fBM_interval);
-598
-599
+      if (simpar.asString("mode") == "individual")
-600
+	tcorruptor_p->initialize(Seed,Beta,Scale,rxType);
-601
+      else if (simpar.asString("mode") == "screen") {
-602
+	const MSAntennaColumns& antcols(vi.msColumns().antenna());
-603
+	if (simpar.isDefined("windspeed")) {
-604
+	  tcorruptor_p->windspeed()=simpar.asFloat("windspeed");
-605
+	  tcorruptor_p->initialize(Seed,Beta,Scale,rxType,antcols);

casa6

Commits

Jira Issues

Add shortcut