Changeset 2305 for trunk


Ignore:
Timestamp:
09/20/11 11:25:34 (13 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_importasdm_sd

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed build failure on asdm2ASAP.
As Michel removed 'using namespace' sentence from alma_v3 library,
some enums must declare their namespace explicitly.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/asdm2ASAP/ASDMReader.cc

    r2301 r2305  
    866866    srcdir[1] = limitedAngle( srcdirA[1].get() ) ;
    867867    if ( srow->isDirectionCodeExists() ) {
    868       DirectionReferenceCode dircode = srow->getDirectionCode() ;
     868      DirectionReferenceCodeMod::DirectionReferenceCode dircode = srow->getDirectionCode() ;
    869869      //logsink_->postLocally( LogMessage("dircode="+CDirectionReferenceCode::toString(dircode),LogOrigin(className_,funcName,WHERE)) ) ;
    870       if ( dircode != J2000 ) {
     870      if ( dircode != DirectionReferenceCodeMod::J2000 ) {
    871871        // if not J2000, need direction conversion
    872872        String ref( CDirectionReferenceCode::toString( dircode ) ) ;
    … …  
    920920  int srctype = SrcType::NOTYPE ;
    921921  ScanRow *scanrow = asdm_->getScan().getRowByKey( execBlockTag_, (int)scan ) ;
    922   ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
     922  ScanIntentMod::ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
    923923  SubscanRow *subrow = asdm_->getSubscan().getRowByKey( execBlockTag_, (int)scan, (int)subscan ) ;
    924   SubscanIntent subIntent = subrow->getSubscanIntent() ;
    925   SwitchingMode swmode = NO_SWITCHING ;
     924  SubscanIntentMod::SubscanIntent subIntent = subrow->getSubscanIntent() ;
     925  SwitchingModeMod::SwitchingMode swmode = SwitchingModeMod::NO_SWITCHING ;
    926926  if ( subrow->isSubscanModeExists() )
    927927    swmode = subrow->getSubscanMode() ;
    928   if ( scanIntent == OBSERVE_TARGET ) {
     928  if ( scanIntent == ScanIntentMod::OBSERVE_TARGET ) {
    929929    // on sky scan
    930     if ( swmode == NO_SWITCHING || swmode == POSITION_SWITCHING ) {
     930    if ( swmode == SwitchingModeMod::NO_SWITCHING || swmode == SwitchingModeMod::POSITION_SWITCHING ) {
    931931      // position switching
    932932      // tentatively set NO_SWITCHING = POSITION_SWITCHING
    933       if ( subIntent == ON_SOURCE ) {
     933      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    934934        srctype = SrcType::PSON ;
    935935      }
    936       else if ( subIntent == OFF_SOURCE ) {
     936      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    937937        srctype = SrcType::PSOFF ;
    938938      }
    939939    }
    940     else if ( swmode == FREQUENCY_SWITCHING ) {
     940    else if ( swmode == SwitchingModeMod::FREQUENCY_SWITCHING ) {
    941941      // frequency switching
    942       if ( subIntent == ON_SOURCE ) {
     942      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    943943        srctype = SrcType::FSON ;
    944944      }
    945       else if ( subIntent == OFF_SOURCE ) {
     945      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    946946        srctype = SrcType::FSOFF ;
    947947      }
    948948    }
    949     else if ( swmode == NUTATOR_SWITCHING ) {
     949    else if ( swmode == SwitchingModeMod::NUTATOR_SWITCHING ) {
    950950      // nutator switching
    951       if ( subIntent == ON_SOURCE ) {
     951      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    952952        srctype = SrcType::PSON ;
    953953      }
    954       else if ( subIntent == OFF_SOURCE ) {
     954      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    955955        srctype = SrcType::PSOFF ;
    956956      }
    … …  
    958958    else {
    959959      // other switching mode
    960       if ( subIntent == ON_SOURCE ) {
     960      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    961961        srctype = SrcType::SIG ;
    962962      }
    963       else if ( subIntent == OFF_SOURCE ) {
     963      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    964964        srctype = SrcType::REF ;
    965965      }
    966966    }
    967967  }
    968   else if ( scanIntent == CALIBRATE_ATMOSPHERE ) {
    969     if ( swmode == NO_SWITCHING || swmode == POSITION_SWITCHING ) {
     968  else if ( scanIntent == ScanIntentMod::CALIBRATE_ATMOSPHERE ) {
     969    if ( swmode == SwitchingModeMod::NO_SWITCHING || swmode == SwitchingModeMod::POSITION_SWITCHING ) {
    970970      // position switching
    971971      // tentatively set NO_SWITCHING = POSITION_SWITCHING
    972       if ( subIntent == ON_SOURCE ) {
     972      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    973973        srctype = SrcType::PONCAL ;
    974974      }
    975       else if ( subIntent == OFF_SOURCE ) {
     975      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    976976        srctype = SrcType::POFFCAL ;
    977977      }
    978978    }
    979     else if ( swmode == FREQUENCY_SWITCHING ) {
     979    else if ( swmode == SwitchingModeMod::FREQUENCY_SWITCHING ) {
    980980      // frequency switching
    981       if ( subIntent == ON_SOURCE ) {
     981      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    982982        srctype = SrcType::FONCAL ;
    983983      }
    984       else if ( subIntent == OFF_SOURCE ) {
     984      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    985985        srctype = SrcType::FOFFCAL ;
    986986      }
    987987    }
    988     else if ( swmode == NUTATOR_SWITCHING ) {
     988    else if ( swmode == SwitchingModeMod::NUTATOR_SWITCHING ) {
    989989      // nutator switching
    990       if ( subIntent == ON_SOURCE ) {
     990      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    991991        srctype = SrcType::PONCAL ;
    992992      }
    993       else if ( subIntent == OFF_SOURCE ) {
     993      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    994994        srctype = SrcType::POFFCAL ;
    995995      }
    … …  
    997997    else {
    998998      // other switching mode
    999       if ( subIntent == ON_SOURCE ) {
     999      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    10001000        srctype = SrcType::CAL ;
    10011001      }
    1002       else if ( subIntent == OFF_SOURCE ) {
     1002      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    10031003        srctype = SrcType::CAL ;
    10041004      }
    … …  
    10071007  else {
    10081008    // off sky (e.g. calibrator device) scan
    1009     if ( subIntent == ON_SOURCE ) {
     1009    if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
    10101010      srctype = SrcType::SIG ;
    10111011    }
    1012     else if ( subIntent == OFF_SOURCE ) {
     1012    else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
    10131013      srctype = SrcType::REF ;
    10141014    }
    1015     else if ( subIntent == HOT ) {
     1015    else if ( subIntent == SubscanIntentMod::HOT ) {
    10161016      srctype = SrcType::HOT ;
    10171017    }
    1018     else if ( subIntent == AMBIENT ) {
     1018    else if ( subIntent == SubscanIntentMod::AMBIENT ) {
    10191019      srctype = SrcType::SKY ;
    10201020    }
    … …  
    12391239           //|| atmrow->getReceiverBand() != rb
    12401240           //|| atmrow->getBasebandName() != bbname
    1241            || atmrow->getCalDataUsingCalDataId()->getCalType() != CAL_ATMOSPHERE )
     1241           || atmrow->getCalDataUsingCalDataId()->getCalType() != CalTypeMod::CAL_ATMOSPHERE )
    12421242        continue ;
    12431243      else {
    … …  
    13421342  vector<StationRow *> srows = stab.get() ;
    13431343  for ( unsigned int irow = 0 ; irow < srows.size() ; irow++ ) {
    1344     StationType stype = srows[irow]->getType() ;
     1344    StationTypeMod::StationType stype = srows[irow]->getType() ;
    13451345    Tag stag = srows[irow]->getStationId() ;
    1346     if ( stype == ANTENNA_PAD )
     1346    if ( stype == StationTypeMod::ANTENNA_PAD )
    13471347      antennaPad_.push_back( stag ) ;
    1348     else if ( stype == WEATHER_STATION )
     1348    else if ( stype == StationTypeMod::WEATHER_STATION )
    13491349      weatherStation_.push_back( stag ) ;
    13501350  }
    … …  
    17241724  SpectralWindowTable &spwtab = asdm_->getSpectralWindow() ;
    17251725  vector<SpectralWindowRow *> rows = spwtab.get() ;
    1726   vector<FrequencyReferenceCode> measFreqRef( rows.size() ) ;
     1726  vector<FrequencyReferenceCodeMod::FrequencyReferenceCode> measFreqRef( rows.size() ) ;
    17271727  int nref = 0 ;
    17281728  for ( unsigned int irow = 0 ; irow < rows.size() ; irow++ ) {
Note: See TracChangeset for help on using the changeset viewer.