casa / casa5 / 32734a1c242

Commits

George Moellenbrock authored 32734a1c242 Merge 26 Mar 2018

Merge branch 'master' into feature/CAS-10977

code/alma/apps/asdm2MS/bdflags2MS.cc

Modified

-1791
+					    iMSRow,
-1792
+					    flag,
-1793
+					    flagRow,
-1794
+					    ocorrelationMode);
-1795
+	}
-1796
+	break;
-1797
-1798
+      case ProcessorTypeMod::RADIOMETER :
-1799
+	{
-1800
+	  const SDMDataObject& sdo = sdor.read(bdfPath);
--
+	  const SDMDataObject::BinaryPart & flagsBP = sdo.dataStruct().flags();
--
+	  const vector<AxisName> & flagsAxes = flagsBP.axes();
--
+	  ostringstream oss;
--
+	  hack06 hack06_instance(oss);
--
+	  for_each(flagsAxes.begin(), flagsAxes.end(), hack06_instance);
--
--
+	  // Check the validity of the sequence of flags axes (depending on the fact that data are packed or not).
--
+	  // also check tos ee if the first integration should be skipped - only done for packed data
--
+	  // must be known before accumulator is instantiated.
--
+	  bool skipFirstIntegration = false;
--
+	  if (sdo.hasPackedData()) {
--
+	    if (!regex_match(oss.str(), ALMARadiometerPackedFlagsAxesRegex))
--
+	      throw ProcessFlagsException("'" + oss.str() + "' is not a valid sequence of flags axes for an ALMA radiometer.");
--
--
+	    // determine if the first integration should be skipped due a duplicate time from a subscan.
--
+	    const SDMDataSubset& sdmDataSubset = sdo.sdmDataSubsets()[0];
--
+	    int64_t  deltaTime = sdmDataSubset.interval() / sdo.numTime();
--
+	    int64_t startTime = (int64_t)sdmDataSubset.time() -  (int64_t)sdmDataSubset.interval()/2LL + deltaTime/2LL;
--
--
+	    // should the first integration be skipped? Any actual skipping happens later.
--
+	    skipFirstIntegration = checkDupInts && lastTimeMap[mR->getConfigDescriptionId()] == ArrayTime(startTime).getMJD();
--
+	    if (debug && skipFirstIntegration) {
--
+	      cout << "Duplicate time seen in Row : " << mainRowIndex[iASDMIndex]
--
+		   << " cdId : " << mR->getConfigDescriptionId()
--
+		   << " " << mR->getDataUID().getEntityId().toString()
--
+		   << " numTime : " << sdo.numTime()
--
+		   << endl;
-+
+	  // should this correlationMode be skipped? This is probably always AUTO_ONLY, but this is a general test just in case
-+
+	  if ((sdo.correlationMode()==CorrelationModeMod::AUTO_ONLY and ocorrelationMode==CorrelationModeMod::CROSS_ONLY) ||
-+
+	      (sdo.correlationMode()==CorrelationModeMod::CROSS_ONLY and ocorrelationMode==CorrelationModeMod::AUTO_ONLY)) {
-+
+	    if (debug) {
-+
+	      cout << "Skipped file " << bdfPath << " due to output correlation mode selection" << endl;
-1806
+	    }
--
+	    lastTimeMap[mR->getConfigDescriptionId()] = ArrayTime(startTime+(sdo.numTime()-1)*deltaTime).getMJD();
--
+	  }
--
+	  else {
--
+	    if (!regex_match(oss.str(), ALMARadiometerFlagsAxesRegex))
--
+	      throw ProcessFlagsException("'" + oss.str() + "' is not a valid sequence of flags axes for an ALMA radiometer.");
--
+	  }
--
+	  unsigned int numIntegrations = sdo.hasPackedData() ? sdo.numTime() : sdo.sdmDataSubsets().size();
--
+	  if (numIntegrations != numIntegration) {
--
+	    infostream << "(the number of integrations actually read in the BDF (numIntegrations = " << numIntegrations << ") is different from the value announced in the Main table (numIntegration = " << numIntegration
--
+		       << "). Using " << numIntegrations << ")";
--
+	  }
--
+	  MSFlagAccumulator<char> accumulator(numIntegrations, antennas.size(), numDD);
-+
+	  } else {
-+
+	    const SDMDataObject::BinaryPart & flagsBP = sdo.dataStruct().flags();
-+
+	    const vector<AxisName> & flagsAxes = flagsBP.axes();
-+
+	    ostringstream oss;
-+
+	    hack06 hack06_instance(oss);
-+
+	    for_each(flagsAxes.begin(), flagsAxes.end(), hack06_instance);
-+
-+
+	    // Check the validity of the sequence of flags axes (depending on the fact that data are packed or not).
-+
+	    // also check tos ee if the first integration should be skipped - only done for packed data
-+
+	    // must be known before accumulator is instantiated.
-+
+	    bool skipFirstIntegration = false;
-+
+	    if (sdo.hasPackedData()) {
-+
+	      if (!regex_match(oss.str(), ALMARadiometerPackedFlagsAxesRegex))
-+
+		throw ProcessFlagsException("'" + oss.str() + "' is not a valid sequence of flags axes for an ALMA radiometer.");
-+
-+
+	      // determine if the first integration should be skipped due a duplicate time from a subscan.
-+
+	      const SDMDataSubset& sdmDataSubset = sdo.sdmDataSubsets()[0];
-+
+	      int64_t  deltaTime = sdmDataSubset.interval() / sdo.numTime();
-+
+	      int64_t startTime = (int64_t)sdmDataSubset.time() -  (int64_t)sdmDataSubset.interval()/2LL + deltaTime/2LL;
-+
-+
+	      // should the first integration be skipped? Any actual skipping happens later.
-+
+	      skipFirstIntegration = checkDupInts && lastTimeMap[mR->getConfigDescriptionId()] == ArrayTime(startTime).getMJD();
-+
+	      if (debug && skipFirstIntegration) {
-+
+		cout << "Duplicate time seen in Row : " << mainRowIndex[iASDMIndex]
-+
+		     << " cdId : " << mR->getConfigDescriptionId()
-+
+		     << " " << mR->getDataUID().getEntityId().toString()
-+
+		     << " numTime : " << sdo.numTime()
-+
+		     << endl;
-+
+	      }
-+
+	      lastTimeMap[mR->getConfigDescriptionId()] = ArrayTime(startTime+(sdo.numTime()-1)*deltaTime).getMJD();
-+
+	    }
-+
+	    else {
-+
+	      if (!regex_match(oss.str(), ALMARadiometerFlagsAxesRegex))
-+
+		throw ProcessFlagsException("'" + oss.str() + "' is not a valid sequence of flags axes for an ALMA radiometer.");
-+
+	    }
-+
+	    unsigned int numIntegrations = sdo.hasPackedData() ? sdo.numTime() : sdo.sdmDataSubsets().size();
-+
+	    if (numIntegrations != numIntegration) {
-+
+	      infostream << "(the number of integrations actually read in the BDF (numIntegrations = " << numIntegrations << ") is different from the value announced in the Main table (numIntegration = " << numIntegration
-+
+			 << "). Using " << numIntegrations << ")";
-+
+	    }
-+
+	    MSFlagAccumulator<char> accumulator(numIntegrations, antennas.size(), numDD);
-1848
--
+	  const FLAGSTYPE *	flags_p	 = NULL;
--
+	  unsigned int		numFlags = 0;
-+
+	    const FLAGSTYPE *	flags_p	 = NULL;
-+
+	    unsigned int	numFlags = 0;
-1851
--
+	  if (sdo.hasPackedData()) {
--
+	    numFlags = sdo.tpDataSubset().flags(flags_p);
--
+	    pair<unsigned int, const FLAGSTYPE *> flagsPair(numFlags, flags_p);
--
+	    accumulator.resetIntegration();
--
+	    traverseALMARadiometerFlagsAxes(numIntegrations, sdo.dataStruct().basebands(), antennas, flagsPair, flagEval, accumulator);
--
+	  }
--
+	  else {
--
+	    // duplicate integrations are not checked or skipped here
--
+	    const vector<SDMDataSubset>& sdmDataSubsets = sdo.sdmDataSubsets();
--
+	    accumulator.resetIntegration();
--
+	    for (unsigned int iIntegration = 0; iIntegration < numIntegrations; iIntegration++) {
--
+	      numFlags = sdmDataSubsets[iIntegration].flags(flags_p);
-+
+	    if (sdo.hasPackedData()) {
-+
+	      numFlags = sdo.tpDataSubset().flags(flags_p);
-1854
+	      pair<unsigned int, const FLAGSTYPE *> flagsPair(numFlags, flags_p);
--
+	      traverseALMARadiometerFlagsAxes(1, sdo.dataStruct().basebands(), antennas, flagsPair, flagEval, accumulator);
-+
+	      accumulator.resetIntegration();
-+
+	      traverseALMARadiometerFlagsAxes(numIntegrations, sdo.dataStruct().basebands(), antennas, flagsPair, flagEval, accumulator);
-1857
+	    }
--
+	    // MAFlagAccumulator::flagCell() just returns a data member, it doesn't change anything
--
+	    // in the object, and here, the returned value (x) is not used.  So this can be
--
+	    // safely commented out.
--
+	    // const vector < vector < vector <FLAG_CELL> > >& x = accumulator.flagCell();
--
+	  }
--
+	  infostream.str("");
-+
+	    else {
-+
+	      // duplicate integrations are not checked or skipped here
-+
+	      const vector<SDMDataSubset>& sdmDataSubsets = sdo.sdmDataSubsets();
-+
+	      accumulator.resetIntegration();
-+
+	      for (unsigned int iIntegration = 0; iIntegration < numIntegrations; iIntegration++) {
-+
+		numFlags = sdmDataSubsets[iIntegration].flags(flags_p);
-+
+		pair<unsigned int, const FLAGSTYPE *> flagsPair(numFlags, flags_p);
-+
+		traverseALMARadiometerFlagsAxes(1, sdo.dataStruct().basebands(), antennas, flagsPair, flagEval, accumulator);
-+
+	      }
-+
+	      // MAFlagAccumulator::flagCell() just returns a data member, it doesn't change anything
-+
+	      // in the object, and here, the returned value (x) is not used.  So this can be
-+
+	      // safely commented out.
-+
+	      // const vector < vector < vector <FLAG_CELL> > >& x = accumulator.flagCell();
-+
+	    }
-+
+	    infostream.str("");
-1873
--
+	  infostream << "ASDM Main row #" << mainRowIndex[iASDMIndex] << " - " << numIntegrations  << "/" << numIntegrations << " integrations done so far.";
--
+	  info(infostream.str());
-+
+	    infostream << "ASDM Main row #" << mainRowIndex[iASDMIndex] << " - " << numIntegrations  << "/" << numIntegrations << " integrations done so far.";
-+
+	    info(infostream.str());
-1876
-+
+	    pair<uInt, uInt> putReturn = put(accumulator, iMSRow, flag, flagRow,skipFirstIntegration);
-+
+	    //	  accumulator.dump(cout, true);
-+
+	    iMSRow = putReturn.first;
-+
+	    numFlaggedRows = putReturn.second;
-+
+	  }
-1882
+	  sdor.done();
--
+	  pair<uInt, uInt> putReturn = put(accumulator, iMSRow, flag, flagRow,skipFirstIntegration);
--
+	  //	  accumulator.dump(cout, true);
--
+	  iMSRow = putReturn.first;
--
+	  numFlaggedRows = putReturn.second;
-1883
+	}
-1884
+	break;
-1885
-1886
+      default:
-1887
+	throw ProcessFlagsException("Unrecognized processor type.");
-1888
+      }
-1889
+      infostream.str("");
-1890
+      infostream << "ASDM Main row #" << mainRowIndex[iASDMIndex]
-1891
+		 << " (scan #" << mR->getScanNumber()
-1892
+		 <<", subscan #" <<  mR->getSubscanNumber()

casa5

Commits

Jira Issues

Add shortcut