Ignore:
Timestamp:
05/13/14 14:39:48 (10 years ago)
Author:
Malte Marquarding
Message:

Finally fix aall warning: deprecated conversion from string constant to 'char*'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/atnf/PKSIO/GBTFITSreader.cc

    r2907 r2940  
    170170  // Move to the SDFITS extension.
    171171  cALFA = cALFA_BD = cALFA_CIMA = 0;
    172   char *extName = "SINGLE DISH" ;
    173   if (fits_movnam_hdu(cSDptr, BINARY_TBL, "SINGLE DISH", 0, &cStatus)) {
     172  char *extName = (char *)"SINGLE DISH" ;
     173  if (fits_movnam_hdu(cSDptr, BINARY_TBL, extName, 0, &cStatus)) {
    174174    // No SDFITS table, look for BDFITS or CIMAFITS.
    175175    cStatus = 0;
    176     if (fits_movnam_hdu(cSDptr, BINARY_TBL, "BDFITS", 0, &cStatus) == 0) {
     176    if (fits_movnam_hdu(cSDptr, BINARY_TBL, (char *)"BDFITS", 0, &cStatus) == 0) {
    177177      cALFA_BD = 1;
    178       extName = "BDFITS" ;
     178      extName = (char *)"BDFITS" ;
    179179
    180180    } else {
    181181      cStatus = 0;
    182       if (fits_movnam_hdu(cSDptr, BINARY_TBL, "CIMAFITS", 0, &cStatus) == 0) {
     182      if (fits_movnam_hdu(cSDptr, BINARY_TBL, (char *)"CIMAFITS", 0, &cStatus) == 0) {
    183183        cALFA_CIMA = 1;
    184         extName = "CIMAFITS" ;
     184        extName = (char *)"CIMAFITS" ;
    185185
    186186        // Check for later versions of CIMAFITS.
    187187        float version;
    188         readParm("VERSION", TFLOAT, &version);
     188        readParm((char *)(char *)"VERSION", TFLOAT, &version);
    189189        if (version >= 2.0f) cALFA_CIMA = int(version);
    190190
    … …  
    282282  // GBT data.
    283283  char telescope[32];
    284   readParm("TELESCOP", TSTRING, telescope);      // Core.
     284  readParm((char *)(char *)"TELESCOP", TSTRING, telescope);      // Core.
    285285  cGBT = strncmp(telescope, "GBT", 3) == 0 ||
    286286         strncmp(telescope, "NRAO_GBT", 8) == 0;
    … …  
    288288
    289289  // Check that the DATA array column is present.
    290   findData(DATA, "DATA", TFLOAT);
     290  findData(DATA, (char *)(char *)"DATA", TFLOAT);
    291291  haveSpectra = cHaveSpectra = cData[DATA].colnum > 0;
    292292
    … …  
    305305      // no TDIM (or MAXISn) card; use the LAGS_IN value.
    306306      cNAxes = 5;
    307       readParm("LAGS_IN", TLONG, cNAxis);
     307      readParm((char *)"LAGS_IN", TLONG, cNAxis);
    308308      cNAxis[1] = 1;
    309309      cNAxis[2] = 1;
    … …  
    325325    }
    326326
    327     findData(FLAGGED, "FLAGGED", TBYTE);
     327    findData(FLAGGED, (char *)(char *)"FLAGGED", TBYTE);
    328328
    329329  } else {
    330330    // DATA column not present, check for a DATAXED keyword.
    331     findData(DATAXED, "DATAXED", TSTRING);
     331    findData(DATAXED, (char *)(char *)"DATAXED", TSTRING);
    332332    if (cData[DATAXED].colnum < 0) {
    333333      log(LogOrigin( className, methodName, WHERE ), LogIO::SEVERE, "DATA array column absent from binary table.");
    … …  
    338338    // Determine the number of axes and their length.
    339339    char dataxed[32];
    340     readParm("DATAXED", TSTRING, dataxed);
     340    readParm((char *)(char *)"DATAXED", TSTRING, dataxed);
    341341
    342342    for (int iaxis = 0; iaxis < 5; iaxis++) cNAxis[iaxis] = 0;
    … …  
    348348  }
    349349
    350   char  *CTYPE[5] = {"CTYPE1", "CTYPE2", "CTYPE3", "CTYPE4", "CTYPE5"};
    351   char  *CRPIX[5] = {"CRPIX1", "CRPIX2", "CRPIX3", "CRPIX4", "CRPIX5"};
    352   char  *CRVAL[5] = {"CRVAL1", "CRVAL2", "CRVAL3", "CRVAL4", "CRVAL5"};
    353   char  *CDELT[5] = {"CDELT1", "CDELT2", "CDELT3", "CDELT4", "CDELT5"};
     350  char  *CTYPE[5] = {(char *)"CTYPE1", (char *)"CTYPE2", (char *)"CTYPE3", (char *)"CTYPE4", (char *)"CTYPE5"};
     351  char  *CRPIX[5] = {(char *)"CRPIX1", (char *)"CRPIX2", (char *)"CRPIX3", (char *)"CRPIX4", (char *)"CRPIX5"};
     352  char  *CRVAL[5] = {(char *)"CRVAL1", (char *)"CRVAL2", (char *)"CRVAL3", (char *)"CRVAL4", (char *)"CRVAL5"};
     353  char  *CDELT[5] = {(char *)"CDELT1", (char *)"CDELT2", (char *)"CDELT3", (char *)"CDELT4", (char *)"CDELT5"};
    354354
    355355  // Find required DATA array axes.
    … …  
    429429    // Fixed in ALFA CIMAFITS.
    430430    cRaAxis = 2;
    431     raCRVAL = "CRVAL2A";
     431    raCRVAL = (char *)"CRVAL2A";
    432432
    433433    cDecAxis = 3;
    434     decCRVAL = "CRVAL3A";
     434    decCRVAL = (char *)"CRVAL3A";
    435435  }
    436436
    … …  
    444444
    445445  // Set up machinery for data retrieval.
    446   findData(SCAN,     "SCAN",     TINT);         // Shared.
    447   findData(CYCLE,    "CYCLE",    TINT);         // Additional.
    448   findData(DATE_OBS, "DATE-OBS", TSTRING);      // Core.
     446  findData(SCAN,     (char *)(char *)"SCAN",     TINT);         // Shared.
     447  findData(CYCLE,    (char *)(char *)"CYCLE",    TINT);         // Additional.
     448  findData(DATE_OBS, (char *)"DATE-OBS", TSTRING);      // Core.
    449449
    450450  if (cTimeAxis >= 0) {
    … …  
    461461
    462462  } else {
    463     findData(TIME,   "TIME",     TDOUBLE);      // Core.
    464   }
    465 
    466   findData(EXPOSURE, "EXPOSURE", TFLOAT);       // Core.
    467   findData(OBJECT,   "OBJECT",   TSTRING);      // Core.
    468   findData(OBJ_RA,   "OBJ-RA",   TDOUBLE);      // Additional.
    469   findData(OBJ_DEC,  "OBJ-DEC",  TDOUBLE);      // Additional.
    470   findData(RESTFRQ,  "RESTFRQ",  TDOUBLE);      // Additional.
    471   findData(OBSMODE,  "OBSMODE",  TSTRING);      // Shared.
    472 
    473   findData(BEAM,     "BEAM",     TSHORT);       // Additional.
    474   findData(IF,       "IF",       TSHORT);       // Additional.
     463    findData(TIME,   (char *)(char *)"TIME",     TDOUBLE);      // Core.
     464  }
     465
     466  findData(EXPOSURE, (char *)(char *)"EXPOSURE", TFLOAT);       // Core.
     467  findData(OBJECT,   (char *)(char *)"OBJECT",   TSTRING);      // Core.
     468  findData(OBJ_RA,   (char *)"OBJ-RA",   TDOUBLE);      // Additional.
     469  findData(OBJ_DEC,  (char *)"OBJ-DEC",  TDOUBLE);      // Additional.
     470  findData(RESTFRQ,  (char *)(char *)"RESTFRQ",  TDOUBLE);      // Additional.
     471  findData(OBSMODE,  (char *)(char *)"OBSMODE",  TSTRING);      // Shared.
     472
     473  findData(BEAM,     (char *)(char *)"BEAM",     TSHORT);       // Additional.
     474  findData(IF,       (char *)(char *)"IF",       TSHORT);       // Additional.
    475475  findData(FqRefVal,  fqCRVAL,   TDOUBLE);      // Frequency reference value.
    476476  findData(FqDelt,    fqCDELT,   TDOUBLE);      // Frequency increment.
    … …  
    478478  findData(RA,        raCRVAL,   TDOUBLE);      // Right ascension.
    479479  findData(DEC,      decCRVAL,   TDOUBLE);      // Declination.
    480   findData(SCANRATE, "SCANRATE", TFLOAT);       // Additional.
    481 
    482   findData(TSYS,     "TSYS",     TFLOAT);       // Core.
    483   findData(CALFCTR,  "CALFCTR",  TFLOAT);       // Additional.
    484   findData(XCALFCTR, "XCALFCTR", TFLOAT);       // Additional.
    485   findData(BASELIN,  "BASELIN",  TFLOAT);       // Additional.
    486   findData(BASESUB,  "BASESUB",  TFLOAT);       // Additional.
    487   findData(XPOLDATA, "XPOLDATA", TFLOAT);       // Additional.
    488 
    489   findData(REFBEAM,  "REFBEAM",  TSHORT);       // Additional.
    490   findData(TCAL,     "TCAL",     TFLOAT);       // Shared.
    491   findData(TCALTIME, "TCALTIME", TSTRING);      // Additional.
    492   findData(AZIMUTH,  "AZIMUTH",  TFLOAT);       // Shared.
    493   findData(ELEVATIO, "ELEVATIO", TFLOAT);       // Shared.
    494   findData(PARANGLE, "PARANGLE", TFLOAT);       // Additional.
    495   findData(FOCUSAXI, "FOCUSAXI", TFLOAT);       // Additional.
    496   findData(FOCUSTAN, "FOCUSTAN", TFLOAT);       // Additional.
    497   findData(FOCUSROT, "FOCUSROT", TFLOAT);       // Additional.
    498   findData(TAMBIENT, "TAMBIENT", TFLOAT);       // Shared.
    499   findData(PRESSURE, "PRESSURE", TFLOAT);       // Shared.
    500   findData(HUMIDITY, "HUMIDITY", TFLOAT);       // Shared.
    501   findData(WINDSPEE, "WINDSPEE", TFLOAT);       // Shared.
    502   findData(WINDDIRE, "WINDDIRE", TFLOAT);       // Shared.
     480  findData(SCANRATE, (char *)(char *)"SCANRATE", TFLOAT);       // Additional.
     481
     482  findData(TSYS,     (char *)(char *)"TSYS",     TFLOAT);       // Core.
     483  findData(CALFCTR,  (char *)(char *)"CALFCTR",  TFLOAT);       // Additional.
     484  findData(XCALFCTR, (char *)(char *)"XCALFCTR", TFLOAT);       // Additional.
     485  findData(BASELIN,  (char *)(char *)"BASELIN",  TFLOAT);       // Additional.
     486  findData(BASESUB,  (char *)(char *)"BASESUB",  TFLOAT);       // Additional.
     487  findData(XPOLDATA, (char *)(char *)"XPOLDATA", TFLOAT);       // Additional.
     488
     489  findData(REFBEAM,  (char *)(char *)"REFBEAM",  TSHORT);       // Additional.
     490  findData(TCAL,     (char *)(char *)"TCAL",     TFLOAT);       // Shared.
     491  findData(TCALTIME, (char *)(char *)"TCALTIME", TSTRING);      // Additional.
     492  findData(AZIMUTH,  (char *)(char *)"AZIMUTH",  TFLOAT);       // Shared.
     493  findData(ELEVATIO, (char *)(char *)"ELEVATIO", TFLOAT);       // Shared.
     494  findData(PARANGLE, (char *)(char *)"PARANGLE", TFLOAT);       // Additional.
     495  findData(FOCUSAXI, (char *)(char *)"FOCUSAXI", TFLOAT);       // Additional.
     496  findData(FOCUSTAN, (char *)(char *)"FOCUSTAN", TFLOAT);       // Additional.
     497  findData(FOCUSROT, (char *)(char *)"FOCUSROT", TFLOAT);       // Additional.
     498  findData(TAMBIENT, (char *)(char *)"TAMBIENT", TFLOAT);       // Shared.
     499  findData(PRESSURE, (char *)(char *)"PRESSURE", TFLOAT);       // Shared.
     500  findData(HUMIDITY, (char *)(char *)"HUMIDITY", TFLOAT);       // Shared.
     501  findData(WINDSPEE, (char *)(char *)"WINDSPEE", TFLOAT);       // Shared.
     502  findData(WINDDIRE, (char *)(char *)"WINDDIRE", TFLOAT);       // Shared.
    503503
    504504  findData(STOKES,    polCRVAL,  TINT);
    505   findData(SIG,       "SIG",     TSTRING);
    506   findData(CAL,       "CAL",     TSTRING);
    507 
    508   findData(RVSYS,     "RVSYS",   TDOUBLE);
    509   findData(VFRAME,    "VFRAME",  TDOUBLE);
    510   findData(VELDEF,    "VELDEF",  TSTRING);
    511 
    512   findData(TIMESTAMP, "TIMESTAMP", TSTRING);
    513   findData(DURATION,  "DURATION", TDOUBLE);
    514   findData(SAMPLER,   "SAMPLER", TSTRING);
     505  findData(SIG,       (char *)(char *)"SIG",     TSTRING);
     506  findData(CAL,       (char *)(char *)"CAL",     TSTRING);
     507
     508  findData(RVSYS,     (char *)(char *)"RVSYS",   TDOUBLE);
     509  findData(VFRAME,    (char *)(char *)"VFRAME",  TDOUBLE);
     510  findData(VELDEF,    (char *)(char *)"VELDEF",  TSTRING);
     511
     512  findData(TIMESTAMP, (char *)(char *)"TIMESTAMP", TSTRING);
     513  findData(DURATION,  (char *)(char *)"DURATION", TDOUBLE);
     514  findData(SAMPLER,   (char *)(char *)"SAMPLER", TSTRING);
    515515
    516516  if (cStatus) {
    … …  
    527527    cScanNo = 0;
    528528    if (cALFA_CIMA) {
    529       findData(SCAN,  "SCAN_ID", TINT);
     529      findData(SCAN,  (char *)"SCAN_ID", TINT);
    530530      if (cALFA_CIMA > 1) {
    531531        // Note that RECNUM increases by cNAxisTime per row.
    532         findData(CYCLE, "RECNUM", TINT);
     532        findData(CYCLE, (char *)(char *)"RECNUM", TINT);
    533533      } else {
    534         findData(CYCLE, "SUBSCAN", TINT);
     534        findData(CYCLE, (char *)(char *)"SUBSCAN", TINT);
    535535      }
    536536    } else if (cALFA_BD) {
    537       findData(SCAN,  "SCAN_NUMBER", TINT);
    538       findData(CYCLE, "PATTERN_NUMBER", TINT);
     537      findData(SCAN,  (char *)"SCAN_NUMBER", TINT);
     538      findData(CYCLE, (char *)"PATTERN_NUMBER", TINT);
    539539    }
    540540  } else {
    … …  
    554554  if (cALFA) {
    555555    // ALFA INPUT_ID, 0-relative (overrides BEAM column if present).
    556     findData(BEAM, "INPUT_ID", TSHORT);
     556    findData(BEAM, (char *)"INPUT_ID", TSHORT);
    557557    cBeam_1rel = 0;
    558558
    … …  
    563563    } else {
    564564      // ms2sdfits output, 0-relative "feed" number.
    565       findData(BEAM, "MAIN_FEED1", TSHORT);
     565      findData(BEAM, (char *)"MAIN_FEED1", TSHORT);
    566566      cBeam_1rel = 0;
    567567    }
    … …  
    573573    // ALFA data, 0-relative.
    574574    if (cALFA_CIMA > 1) {
    575       findData(IF, "IFN", TSHORT);
     575      findData(IF, (char *)(char *)"IFN", TSHORT);
    576576    } else {
    577       findData(IF, "IFVAL", TSHORT);
     577      findData(IF, (char *)(char *)"IFVAL", TSHORT);
    578578    }
    579579    cIF_1rel = 0;
    … …  
    582582  // ms2sdfits writes a scalar "TSYS" column that averages the polarizations.
    583583  int colnum;
    584   findCol("SYSCAL_TSYS", &colnum);
     584  findCol((char *)"SYSCAL_TSYS", &colnum);
    585585  if (colnum > 0) {
    586586    // This contains the vector Tsys.
    587     findData(TSYS, "SYSCAL_TSYS", TFLOAT);
     587    findData(TSYS, (char *)"SYSCAL_TSYS", TFLOAT);
    588588  }
    589589
    … …  
    591591
    592592  if (cData[SCANRATE].colnum < 0) {
    593     findData(SCANRATE, "FIELD_POINTING_DIR_RATE", TFLOAT);
     593    findData(SCANRATE, (char *)"FIELD_POINTING_DIR_RATE", TFLOAT);
    594594  }
    595595
    596596  if (cData[RESTFRQ].colnum < 0) {
    597     findData(RESTFRQ, "RESTFREQ", TDOUBLE);
     597    findData(RESTFRQ, (char *)(char *)"RESTFREQ", TDOUBLE);
    598598    if (cData[RESTFRQ].colnum < 0) {
    599       findData(RESTFRQ, "SPECTRAL_WINDOW_REST_FREQUENCY", TDOUBLE);
     599      findData(RESTFRQ, (char *)"SPECTRAL_WINDOW_REST_FREQUENCY", TDOUBLE);
    600600    }
    601601  }
    602602
    603603  if (cData[OBJ_RA].colnum < 0) {
    604     findData(OBJ_RA, "SOURCE_DIRECTION", TDOUBLE);
     604    findData(OBJ_RA, (char *)"SOURCE_DIRECTION", TDOUBLE);
    605605  }
    606606  if (cData[OBJ_DEC].colnum < 0) {
    607     findData(OBJ_DEC, "SOURCE_DIRECTION", TDOUBLE);
     607    findData(OBJ_DEC, (char *)"SOURCE_DIRECTION", TDOUBLE);
    608608  }
    609609
    … …  
    611611
    612612  if (cData[TCAL].colnum < 0) {
    613     findData(TCAL, "SYSCAL_TCAL", TFLOAT);
     613    findData(TCAL, (char *)"SYSCAL_TCAL", TFLOAT);
    614614  } else if (cALFA_BD) {
    615615    // ALFA BDFITS has a different TCAL with 64 elements - kill it!
    616     findData(TCAL, "NO NO NO", TFLOAT);
     616    findData(TCAL, (char *)"NO NO NO", TFLOAT);
    617617  }
    618618
    619619  if (cALFA_BD) {
    620620    // ALFA BDFITS.
    621     findData(AZIMUTH, "CRVAL2B", TFLOAT);
    622     findData(ELEVATIO, "CRVAL3B", TFLOAT);
     621    findData(AZIMUTH, (char *)(char *)"CRVAL2B", TFLOAT);
     622    findData(ELEVATIO, (char *)(char *)"CRVAL3B", TFLOAT);
    623623  }
    624624
    625625  if (cALFA) {
    626626    // ALFA data.
    627     findData(PARANGLE, "PARA_ANG", TFLOAT);
     627    findData(PARANGLE, (char *)"PARA_ANG", TFLOAT);
    628628  }
    629629
    630630  if (cData[TAMBIENT].colnum < 0) {
    631     findData(TAMBIENT, "WEATHER_TEMPERATURE", TFLOAT);
     631    findData(TAMBIENT, (char *)"WEATHER_TEMPERATURE", TFLOAT);
    632632  }
    633633
    634634  if (cData[PRESSURE].colnum < 0) {
    635     findData(PRESSURE, "WEATHER_PRESSURE", TFLOAT);
     635    findData(PRESSURE, (char *)"WEATHER_PRESSURE", TFLOAT);
    636636  }
    637637
    638638  if (cData[HUMIDITY].colnum < 0) {
    639     findData(HUMIDITY, "WEATHER_REL_HUMIDITY", TFLOAT);
     639    findData(HUMIDITY, (char *)"WEATHER_REL_HUMIDITY", TFLOAT);
    640640  }
    641641
    642642  if (cData[WINDSPEE].colnum < 0) {
    643     findData(WINDSPEE, "WEATHER_WIND_SPEED", TFLOAT);
     643    findData(WINDSPEE, (char *)"WEATHER_WIND_SPEED", TFLOAT);
    644644  }
    645645
    646646  if (cData[WINDDIRE].colnum < 0) {
    647     findData(WINDDIRE, "WEATHER_WIND_DIRECTION", TFLOAT);
     647    findData(WINDDIRE, (char *)"WEATHER_WIND_DIRECTION", TFLOAT);
    648648  }
    649649
    … …  
    768768          if (cData[DATAXED].colnum > 0) {
    769769            char dataxed[32];
    770             readParm("DATAXED", TSTRING, dataxed);
     770            readParm((char *)(char *)"DATAXED", TSTRING, dataxed);
    771771
    772772            sscanf(dataxed, "(%ld,%ld,%ld,%ld,%ld)", cNAxis, cNAxis+1,
    … …  
    10141014  if (cALFA_CIMA > 1) {
    10151015    // FFTs per second when the Mock correlator operates in RFI blanking mode.
    1016     readData("PHFFTACC", TFLOAT, 0, &cALFAacc);
     1016    readData((char *)"PHFFTACC", TFLOAT, 0, &cALFAacc);
    10171017  }
    10181018
    … …  
    10511051
    10521052  // Read parameter values.
    1053   readParm("OBSERVER", TSTRING, observer);              // Shared.
    1054   readParm("PROJID",   TSTRING, project);               // Shared.
    1055   readParm("TELESCOP", TSTRING, telescope);             // Core.
     1053  readParm((char *)(char *)"OBSERVER", TSTRING, observer);              // Shared.
     1054  readParm((char *)(char *)"PROJID",   TSTRING, project);               // Shared.
     1055  readParm((char *)(char *)"TELESCOP", TSTRING, telescope);             // Core.
    10561056
    10571057  antPos[0] = 0.0;
    10581058  antPos[1] = 0.0;
    10591059  antPos[2] = 0.0;
    1060   if (readParm("ANTENNA_POSITION", TDOUBLE, antPos)) {
    1061     readParm("OBSGEO-X",  TDOUBLE, antPos);             // Additional.
    1062     readParm("OBSGEO-Y",  TDOUBLE, antPos + 1);         // Additional.
    1063     readParm("OBSGEO-Z",  TDOUBLE, antPos + 2);         // Additional.
     1060  if (readParm((char *)"ANTENNA_POSITION", TDOUBLE, antPos)) {
     1061    readParm((char *)"OBSGEO-X",  TDOUBLE, antPos);             // Additional.
     1062    readParm((char *)"OBSGEO-Y",  TDOUBLE, antPos + 1);         // Additional.
     1063    readParm((char *)"OBSGEO-Z",  TDOUBLE, antPos + 2);         // Additional.
    10641064  }
    10651065
    10661066  if (antPos[0] == 0.0) {
    10671067    if (cGBT) {
    1068       readParm( "SITELONG", TDOUBLE, antPos ) ;
    1069       readParm( "SITELAT", TDOUBLE, antPos+1 ) ;
    1070       readParm( "SITEELEV", TDOUBLE, antPos+2 ) ;
     1068      readParm( (char *)(char *)"SITELONG", TDOUBLE, antPos ) ;
     1069      readParm( (char *)(char *)"SITELAT", TDOUBLE, antPos+1 ) ;
     1070      readParm( (char *)(char *)"SITEELEV", TDOUBLE, antPos+2 ) ;
    10711071      Vector<Double> pos( 2 ) ;
    10721072      pos[0] = Double( antPos[0] ) ;
    … …  
    11161116  }
    11171117
    1118   readParm("EQUINOX",  TFLOAT,  &equinox);              // Shared.
     1118  readParm((char *)(char *)"EQUINOX",  TFLOAT,  &equinox);              // Shared.
    11191119  if (cStatus == 405) {
    11201120    // EQUINOX was written as string value in early versions.
    11211121    cStatus = 0;
    11221122    char strtmp[32];
    1123     readParm("EQUINOX", TSTRING, strtmp);
     1123    readParm((char *)(char *)"EQUINOX", TSTRING, strtmp);
    11241124    sscanf(strtmp, "%f", &equinox);
    11251125  }
    11261126
    1127   if (readParm("RADESYS", TSTRING, radecsys)) {         // Additional.
    1128     if (readParm("RADECSYS", TSTRING, radecsys)) {      // Additional.
     1127  if (readParm((char *)(char *)"RADESYS", TSTRING, radecsys)) {         // Additional.
     1128    if (readParm((char *)(char *)"RADECSYS", TSTRING, radecsys)) {      // Additional.
    11291129      strcpy(radecsys, "");
    11301130    }
    11311131  }
    11321132
    1133   if (readParm("SPECSYS", TSTRING, dopplerFrame)) {     // Additional.
     1133  if (readParm((char *)(char *)"SPECSYS", TSTRING, dopplerFrame)) {     // Additional.
    11341134    // Fallback value.
    11351135    strcpy(dopplerFrame, "TOPOCENT");
    … …  
    11391139    // Added few more codes currently (as of 2009 Oct) used in the GBT
    11401140    // SDFITS (based io_sdfits_define.pro of GBTIDL). - TT
    1141     if (readParm("VELFRAME", TSTRING, dopplerFrame)) {  // Additional.
     1141    if (readParm((char *)(char *)"VELFRAME", TSTRING, dopplerFrame)) {  // Additional.
    11421142      // No, try digging it out of the CTYPE card (AIPS convention).
    11431143      char keyw[9], ctype[9];
    … …  
    12111211  readTime(1, 1, datobs, utc);
    12121212  readData(FqRefVal, 1, &refFreq);
    1213   readParm("BANDWID", TDOUBLE, &bandwidth);             // Core.
     1213  readParm((char *)(char *)"BANDWID", TDOUBLE, &bandwidth);             // Core.
    12141214
    12151215  if (cStatus) {
    … …  
    12631263            if (cALFA_BD) {
    12641264              unsigned char invert;
    1265               readData("UPPERSB", TBYTE, irow, &invert);
     1265              readData((char *)"UPPERSB", TBYTE, irow, &invert);
    12661266
    12671267              if (invert) {
    … …  
    18671867    unsigned char invert;
    18681868    int anynul, colnum;
    1869     findCol("UPPERSB", &colnum);
     1869    findCol((char *)"UPPERSB", &colnum);
    18701870    fits_read_col(cSDptr, TBYTE, colnum, cRow, 1, 1, 0, &invert, &anynul,
    18711871                  &cStatus);
    … …  
    20112011          // Rescale according to the number of unblanked accumulations.
    20122012          int colnum, naccum;
    2013           findCol("STAT", &colnum);
     2013          findCol((char *)"STAT", &colnum);
    20142014          fits_read_col(cSDptr, TINT, colnum, cRowR, 10*(cTimeIdx-1)+2, 1, 0,
    20152015                        &naccum, &anynul, &cStatus);
    … …  
    26312631  char chars[32];
    26322632  if (cALFA_BD) {
    2633     readData("OBS_NAME", TSTRING, cRow, chars);
     2633    readData((char *)"OBS_NAME", TSTRING, cRow, chars);
    26342634  } else {
    2635     readData("SCANTYPE", TSTRING, cRow, chars);
     2635    readData((char *)"SCANTYPE", TSTRING, cRow, chars);
    26362636  }
    26372637
    … …  
    26912691  if (cALFA_CIMA > 1) {
    26922692    int   colnum, naccum;
    2693     findCol("STAT", &colnum);
     2693    findCol((char *)"STAT", &colnum);
    26942694    fits_read_col(cSDptr, TINT, colnum, cRow, 2, 1, 0, &naccum, &anynul,
    26952695                  &cStatus);
    … …  
    29162916    MEpoch me( Quantity( dd, "d" ), MEpoch::UTC ) ;
    29172917    double antPos[3] ;
    2918     readParm( "SITELONG", TDOUBLE, antPos ) ;
    2919     readParm( "SITELAT", TDOUBLE, antPos+1 ) ;
    2920     readParm( "SITEELEV", TDOUBLE, antPos+2 ) ;
     2918    readParm( (char *)(char *)"SITELONG", TDOUBLE, antPos ) ;
     2919    readParm( (char *)(char *)"SITELAT", TDOUBLE, antPos+1 ) ;
     2920    readParm( (char *)(char *)"SITEELEV", TDOUBLE, antPos+2 ) ;
    29212921    Vector<Double> pos( 2 ) ;
    29222922    pos[0] = Double( antPos[0] ) ;
Note: See TracChangeset for help on using the changeset viewer.