Commits

Ville Suoranta authored f8ff1d6a95a Merge
Merge pull request #406 in CASA/casa6 from CAS-13437 to master

* commit 'd994a71e1bef4ef2327868dc2e84fa8a634529ff': Point casacore to the latest commit in master Fixes partially CAS-13437 Initialize properly scanSeen variable Use a branch in personal casacore that mimics how casacore will look like after merged PRs Use the same initialization of the variables that control the metadata scope as the parent class MSIter. Rebase casacore changes for CAS-13437 on top of more recent changes related to MSMetaData CAS-13437: Point to different commit in casacore VisibililtyIterator: Leave the columns referencing a valid table. Ensure that the underlying TVI uses is reset to originChunks before accessing any metadata Rebase casacore changes on top of master as of Nov 2020 Points to private casacore repository Use same setState() method as in casacore MSIter
No tags

casa5/code/msvis/MSVis/AveragingTvi2.cc

Modified
2379 2379 endBuffer_p = -1;
2380 2380
2381 2381 // Get the first subchunk ready.
2382 2382
2383 2383 produceSubchunk ();
2384 2384 }
2385 2385
2386 2386 void
2387 2387 AveragingTvi2::originChunks (Bool forceRewind)
2388 2388 {
2389 + // Ensure that the underlying VI is in a state where some metadata
2390 + // can be retrieved
2391 + getVii()->originChunks(forceRewind);
2392 +
2393 + // Initialize the chunk
2389 2394 vbAvg_p->startChunk (getVii());
2390 2395
2391 - getVii()->originChunks(forceRewind);
2392 2396 more_p = false;
2393 2397
2394 2398 subchunk_p.resetToOrigin();
2395 2399 }
2396 2400
2397 2401 void
2398 2402 AveragingTvi2::produceSubchunk ()
2399 2403 {
2400 2404 VisBufferImpl2 * vbToFill = dynamic_cast<VisBufferImpl2 *> (getVisBuffer());
2401 2405 assert (vbToFill != 0);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut