Changeset 2306

Timestamp:

09/20/11 11:32:55 (13 years ago)

Author:

Takeshi Nakazato

Message:

merge fix on trunk (r2305).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/asdm2ASAP/ASDMReader.cc (modified) (8 diffs)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/external-alma/asdm2ASAP/ASDMReader.cc

@@ -866 +866 @@
     srcdir[1] = limitedAngle( srcdirA[1].get() ) ;
     if ( srow->isDirectionCodeExists() ) {
-      DirectionReferenceCode dircode = srow->getDirectionCode() ;
+      DirectionReferenceCodeMod::DirectionReferenceCode dircode = srow->getDirectionCode() ;
       //logsink_->postLocally( LogMessage("dircode="+CDirectionReferenceCode::toString(dircode),LogOrigin(className_,funcName,WHERE)) ) ;
-      if ( dircode != J2000 ) {
+      if ( dircode != DirectionReferenceCodeMod::J2000 ) {
         // if not J2000, need direction conversion
         String ref( CDirectionReferenceCode::toString( dircode ) ) ;
@@ -920 +920 @@
   int srctype = SrcType::NOTYPE ;
   ScanRow *scanrow = asdm_->getScan().getRowByKey( execBlockTag_, (int)scan ) ;
-  ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
+  ScanIntentMod::ScanIntent scanIntent = scanrow->getScanIntent()[0] ;
   SubscanRow *subrow = asdm_->getSubscan().getRowByKey( execBlockTag_, (int)scan, (int)subscan ) ;
-  SubscanIntent subIntent = subrow->getSubscanIntent() ;
-  SwitchingMode swmode = NO_SWITCHING ;
+  SubscanIntentMod::SubscanIntent subIntent = subrow->getSubscanIntent() ;
+  SwitchingModeMod::SwitchingMode swmode = SwitchingModeMod::NO_SWITCHING ;
   if ( subrow->isSubscanModeExists() )
     swmode = subrow->getSubscanMode() ;
-  if ( scanIntent == OBSERVE_TARGET ) {
+  if ( scanIntent == ScanIntentMod::OBSERVE_TARGET ) {
     // on sky scan
-    if ( swmode == NO_SWITCHING || swmode == POSITION_SWITCHING ) {
+    if ( swmode == SwitchingModeMod::NO_SWITCHING || swmode == SwitchingModeMod::POSITION_SWITCHING ) {
       // position switching
       // tentatively set NO_SWITCHING = POSITION_SWITCHING
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::PSON ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::PSOFF ;
       }
     }
-    else if ( swmode == FREQUENCY_SWITCHING ) {
+    else if ( swmode == SwitchingModeMod::FREQUENCY_SWITCHING ) {
       // frequency switching
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::FSON ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::FSOFF ;
       }
     }
-    else if ( swmode == NUTATOR_SWITCHING ) {
+    else if ( swmode == SwitchingModeMod::NUTATOR_SWITCHING ) {
       // nutator switching
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::PSON ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::PSOFF ;
       }
@@ -958 +958 @@
     else {
       // other switching mode
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::SIG ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::REF ;
       }
     }
   }
-  else if ( scanIntent == CALIBRATE_ATMOSPHERE ) {
-    if ( swmode == NO_SWITCHING || swmode == POSITION_SWITCHING ) {
+  else if ( scanIntent == ScanIntentMod::CALIBRATE_ATMOSPHERE ) {
+    if ( swmode == SwitchingModeMod::NO_SWITCHING || swmode == SwitchingModeMod::POSITION_SWITCHING ) {
       // position switching
       // tentatively set NO_SWITCHING = POSITION_SWITCHING
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::PONCAL ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::POFFCAL ;
       }
     }
-    else if ( swmode == FREQUENCY_SWITCHING ) {
+    else if ( swmode == SwitchingModeMod::FREQUENCY_SWITCHING ) {
       // frequency switching
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::FONCAL ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::FOFFCAL ;
       }
     }
-    else if ( swmode == NUTATOR_SWITCHING ) {
+    else if ( swmode == SwitchingModeMod::NUTATOR_SWITCHING ) {
       // nutator switching
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::PONCAL ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::POFFCAL ;
       }
@@ -997 +997 @@
     else {
       // other switching mode
-      if ( subIntent == ON_SOURCE ) {
+      if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
         srctype = SrcType::CAL ;
       }
-      else if ( subIntent == OFF_SOURCE ) {
+      else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
         srctype = SrcType::CAL ;
       }
@@ -1007 +1007 @@
   else {
     // off sky (e.g. calibrator device) scan
-    if ( subIntent == ON_SOURCE ) {
+    if ( subIntent == SubscanIntentMod::ON_SOURCE ) {
       srctype = SrcType::SIG ;
     }
-    else if ( subIntent == OFF_SOURCE ) {
+    else if ( subIntent == SubscanIntentMod::OFF_SOURCE ) {
       srctype = SrcType::REF ;
     }
-    else if ( subIntent == HOT ) {
+    else if ( subIntent == SubscanIntentMod::HOT ) {
       srctype = SrcType::HOT ;
     }
-    else if ( subIntent == AMBIENT ) {
+    else if ( subIntent == SubscanIntentMod::AMBIENT ) {
       srctype = SrcType::SKY ;
     }
@@ -1239 +1239 @@
            //|| atmrow->getReceiverBand() != rb 
            //|| atmrow->getBasebandName() != bbname 
-           || atmrow->getCalDataUsingCalDataId()->getCalType() != CAL_ATMOSPHERE ) 
+           || atmrow->getCalDataUsingCalDataId()->getCalType() != CalTypeMod::CAL_ATMOSPHERE ) 
         continue ;
       else {
@@ -1342 +1342 @@
   vector<StationRow *> srows = stab.get() ;
   for ( unsigned int irow = 0 ; irow < srows.size() ; irow++ ) {
-    StationType stype = srows[irow]->getType() ;
+    StationTypeMod::StationType stype = srows[irow]->getType() ;
     Tag stag = srows[irow]->getStationId() ;
-    if ( stype == ANTENNA_PAD )
+    if ( stype == StationTypeMod::ANTENNA_PAD )
       antennaPad_.push_back( stag ) ;
-    else if ( stype == WEATHER_STATION )
+    else if ( stype == StationTypeMod::WEATHER_STATION )
       weatherStation_.push_back( stag ) ;
   }
@@ -1724 +1724 @@
   SpectralWindowTable &spwtab = asdm_->getSpectralWindow() ;
   vector<SpectralWindowRow *> rows = spwtab.get() ;
-  vector<FrequencyReferenceCode> measFreqRef( rows.size() ) ;
+  vector<FrequencyReferenceCodeMod::FrequencyReferenceCode> measFreqRef( rows.size() ) ;
   int nref = 0 ;
   for ( unsigned int irow = 0 ; irow < rows.size() ; irow++ ) {