casa / casa5 / dab2e431a25

Commits

Ville Suoranta authored dab2e431a25 Merge 27 Apr 2018

Merge pull request #485 in CASA/casa from feature/CAS-10060 to master

* commit '2d527481ad4dff786021e4793cbdb60b55a613bb':
  in-line help edits
  Fixed nsigma not being set initially in initMinorCycle. This is a workaround for now and more proper handling is done later.
  save debugging for now
  Fixed typos in log messages
  Made nsigma threshold to be updated before the global exit tests
  Clean up some of debug messages
  Fixed inconsistent log messages for divergent exit conditions
  fixed global exit criteria
  tempoary mod. for debugging
  Removed the debug statements
  Added n-sigma threshold stopping
  initial modifications for N-sigma stopping threshold
  initial modification for n-sgima stopping
  n-sigma threshold - the first round of the modifications

code/synthesis/ImagerObjects/SDAlgorithmBase.cc

Modified

-116
+	    Int startiteration = loopcontrols.getIterDone(); // TODO : CAS-8767 key off subimage index
-117
+	    Float peakresidual=0.0;
-118
+	    Float modelflux=0.0;
-119
+	    Int iterdone=0;
-120
-121
+	    ///itsMaskHandler.resetMask( itsImages ); //, (loopcontrols.getCycleThreshold()/peakresidual) );
-122
+	    Int stopCode=0;
-123
-124
+	    Float startpeakresidual = 0.0;
-125
+	    Float startmodelflux = 0.0;
-+
+            Array<Double> robustrms;
-+
-128
+	    Bool validMask = ( itsImages->getMaskSum() > 0 );
-129
-130
+	    if( validMask ) peakresidual = itsImages->getPeakResidualWithinMask();
-131
+	    else peakresidual = itsImages->getPeakResidual();
-132
+	    modelflux = itsImages->getModelFlux();
-133
-134
+	    startpeakresidual = peakresidual;
-135
+	    startmodelflux = modelflux;
-136
-+
+            // returns as an Array but itsImages is already single plane so
-+
+            // the return rms contains only a single element
-+
+            robustrms = itsImages->calcRobustRMS();
-+
+            //Float nsigma = 150.0; // will set by user, fixed for 3sigma for now.
-+
+            Float nsigma = loopcontrols.getNsigma();
-+
+            Float nsigmathresh = nsigma * (Float)robustrms(IPosition(1,0));
-+
-+
+            Float thresholdtouse;
-+
+            if (nsigma>0.0) {
-+
+              thresholdtouse = max( nsigmathresh, loopcontrols.getCycleThreshold());
-+
+            }
-+
+            else {
-+
+              thresholdtouse = loopcontrols.getCycleThreshold();
-+
+            }
-+
+            os << LogIO::DEBUG1<<"loopcontrols.getCycleThreshold()="<<loopcontrols.getCycleThreshold()<<LogIO::POST;
-+
+            os << LogIO::DEBUG1<< "thresholdtouse="<<thresholdtouse<<LogIO::POST;
-+
+            String thresholddesc = (thresholdtouse == loopcontrols.getCycleThreshold() ? "cyclethreshold" : "n-sigma");
-+
-+
+            if (thresholddesc=="n-sigma") {
-+
+              os << LogIO::DEBUG1<< "Set nsigma thresh="<<nsigmathresh<<LogIO::POST;
-+
+              loopcontrols.setNsigmaThreshold(nsigmathresh);
-+
+            }
-159
+	    loopcontrols.setPeakResidual( peakresidual );
-160
+	    loopcontrols.resetMinResidual(); // Set it to current initial peakresidual.
-+
-+
-163
+	    stopCode = checkStop( loopcontrols,  peakresidual );
-164
-+
-166
+	    // stopCode=0;
-167
-168
+	    if( validMask && stopCode==0 )
-169
+	      {
-170
-171
+		// Record info about the start of the minor cycle iterations
-172
+		loopcontrols.addSummaryMinor( deconvolverid, chanid+polid*nSubChans,
-173
+					      modelflux, peakresidual );
-174
+		//		loopcontrols.setPeakResidual( peakresidual );
-175
-176
+		// Init the deconvolver
-177
+		initializeDeconvolver();
-178
--
-179
+		while ( stopCode==0 )
-180
+		  {
-181
-+
+                    if (nsigma>0.0) {
-+
+                      os << "Using " << thresholddesc << " for threshold criterion: (cyclethreshold="<<loopcontrols.getCycleThreshold()<< ", nsigma threshold="<<nsigmathresh<<" )" << LogIO::POST;
-+
+                      loopcontrols.setNsigmaThreshold(nsigmathresh);
-+
+                    }
-186
+		    Int thisniter = loopcontrols.getCycleNiter() <5000 ? loopcontrols.getCycleNiter() : 2000;
-187
-188
+		    loopcontrols.setPeakResidual( peakresidual );
-189
+		    takeOneStep( loopcontrols.getLoopGain(),
-190
+				 //				 loopcontrols.getCycleNiter(),
-191
+				 thisniter,
--
+				 loopcontrols.getCycleThreshold(),
-+
+				 //loopcontrols.getCycleThreshold(),
-+
+				 thresholdtouse,
-194
+				 peakresidual,
-195
+				 modelflux,
-196
+				 iterdone);
-197
-198
+		    os << LogIO::NORMAL1  << "SDAlgoBase: After one step, dec : " << deconvolverid << "    residual=" << peakresidual << " model=" << modelflux << " iters=" << iterdone << LogIO::POST;
-199
-200
+		    SynthesisUtilMethods::getResource("In Deconvolver : one step" );
-201
-202
+		    loopcontrols.incrementMinorCycleCount( iterdone ); // CAS-8767 : add subimageindex and merge with addSummaryMinor call later.
-203
-249
+		break;
-250
+	      case 3:
-251
+		os << ", Zero iterations performed.";
-252
+		break;
-253
+	      case 4:
-254
+		os << ", Possible divergence. Peak residual increased by 10% from minimum.";
-255
+		break;
-256
+	      case 5:
-257
+		os << ", Exited " << itsAlgorithmName << " minor cycle without reaching any stopping criterion.";
-258
+		break;
-+
+              case 6:
-+
+                os << ", Reached n-sigma threshold.";
-261
+	      default:
-262
+		break;
-263
+	      }
-264
-265
+	       os << LogIO::POST;
-266
-267
+	    loopcontrols.resetCycleIter();
-268
-269
+	    if( peakresidual > maxResidualAcrossPlanes )
-270
+	      {maxResidualAcrossPlanes=peakresidual; maxResChan=chanid; maxResPol=polid;}

casa5

Commits

Jira Issues

Add shortcut