IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4834


Ignore:
Timestamp:
Aug 19, 2005, 5:22:00 PM (21 years ago)
Author:
eugene
Message:

added support for CATMODE and CATFORMAT

Location:
trunk/Ohana/src/opihi/dvo
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/dvo/avextract.c

    r4689 r4834  
    2828  /* find CATDIR in config system */
    2929  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     30  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     31    strcpy (catalog.catmode, "RAW");
    3032
    3133  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/calextract.c

    r4800 r4834  
    3030  /* find CATDIR in config system */
    3131  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     32  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     33    strcpy (catalog.catmode, "RAW");
    3234
    3335  /* command line arguments */

  • trunk/Ohana/src/opihi/dvo/calmextract.c

    r4800 r4834  
    3131  /* find CATDIR in config system */
    3232  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     33  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     34    strcpy (catalog.catmode, "RAW");
    3335
    3436  /* command line arguments */

  • trunk/Ohana/src/opihi/dvo/catalog.c

    r4800 r4834  
    3030  if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    3131
     32  VarConfig ("GSCDIR", "%s", gscdir);
    3233  VarConfig ("CATDIR", "%s", catdir);
    33   VarConfig ("GSCDIR", "%s", gscdir);
     34  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     35    strcpy (catalog.catmode, "RAW");
    3436
    3537  Mz = 17.0;

  • trunk/Ohana/src/opihi/dvo/ccd.c

    r4689 r4834  
    2828  /* find CATDIR in config system */
    2929  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     30  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     31    strcpy (catalog.catmode, "RAW");
    3032
    3133  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/cmd.c

    r4689 r4834  
    2828  /* find CATDIR in config system */
    2929  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     30  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     31    strcpy (catalog.catmode, "RAW");
    3032
    3133  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/ddmags.c

    r4689 r4834  
    2828  /* find CATDIR in config system */
    2929  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     30  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     31    strcpy (catalog.catmode, "RAW");
    3032
    3133  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/dmagaves.c

    r4689 r4834  
    2929  /* find CATDIR in config system */
    3030  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     31  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     32    strcpy (catalog.catmode, "RAW");
    3133
    3234  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/dmagmeas.c

    r4689 r4834  
    2929  /* find CATDIR in config system */
    3030  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     31  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     32    strcpy (catalog.catmode, "RAW");
    3133
    3234  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/dmags.c

    r4689 r4834  
    2828  /* find CATDIR in config system */
    2929  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     30  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     31    strcpy (catalog.catmode, "RAW");
    3032
    3133  /* interpret command-line options */

  • trunk/Ohana/src/opihi/dvo/dmt.c

    r4800 r4834  
    1717  Vector *vec1, *vec2, *vec3, *vec4, *vec5;
    1818
     19  if (!InitPhotcodes ()) return (FALSE);
     20
    1921  VarConfig ("CATDIR", "%s", catdir);
    20   if (!InitPhotcodes ()) return (FALSE);
     22  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     23    strcpy (catalog.catmode, "RAW");
    2124
    2225  vec1 = vec2 = vec3 = vec4 = vec5 = NULL;

  • trunk/Ohana/src/opihi/dvo/extract.c

    r3462 r4834  
    3434  if (!InitPhotcodes ()) return (FALSE);
    3535
     36  VarConfig ("GSCDIR", "%s", gscdir);
    3637  VarConfig ("CATDIR", "%s", catdir);
    37   VarConfig ("GSCDIR", "%s", gscdir);
     38  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     39    strcpy (catalog.catmode, "RAW");
    3840
    3941  regions = (RegionFile *) NULL;

  • trunk/Ohana/src/opihi/dvo/fitcolors.c

    r4689 r4834  
    1414  int N1, N2, i1, i2, mode[4];
    1515  int Nsec, Nregions, status;
    16   char catdir[256], filename[256], *RegionName, *RegionList;
     16  char catdir[256], catmode[16], filename[256], *RegionName, *RegionList;
    1717  char *cmd, *outcmd, *camera;
    1818  double *M1, *M2;
    … …  
    3737  /* find CATDIR in config system */
    3838  if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
     39  if (VarConfig ("CATMODE", "%s", catmode) == NULL) strcpy (catmode, "RAW");
    3940
    4041  /* interpret command-line options */
    … …  
    103104  for (k = 0; k < Nregions; k++) {
    104105    /* lock, load, unlock catalog */
     106    strcpy (catalog[k].catmode, catmode);
    105107    sprintf (filename, "%s/%s", catdir, regions[k].name);
    106108    catalog[k].filename = filename;

  • trunk/Ohana/src/opihi/dvo/imdata.c

    r4800 r4834  
    4040    }     
    4141  }
     42
     43  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     44    strcpy (catalog.catmode, "RAW");
    4245
    4346  if (argc != 4) {

  • trunk/Ohana/src/opihi/dvo/lcurve.c

    r4800 r4834  
    1818
    1919  VarConfig ("CATDIR", "%s", catdir);
     20  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     21    strcpy (catalog.catmode, "RAW");
     22
    2023  if (!InitPhotcodes ()) return (FALSE);
    2124

  • trunk/Ohana/src/opihi/dvo/lightcurve.c

    r4800 r4834  
    1515
    1616  VarConfig ("CATDIR", "%s", catdir);
     17  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     18    strcpy (catalog.catmode, "RAW");
     19
    1720  if (!InitPhotcodes ()) return (FALSE);
    1821  Nsec = GetPhotcodeNsecfilt ();

  • trunk/Ohana/src/opihi/dvo/subpix.c

    r4800 r4834  
    2323
    2424  VarConfig ("CATDIR", "%s", catdir);
     25  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL)
     26    strcpy (catalog.catmode, "RAW");
     27
    2528  GetTimeFormat (&TimeReference, &TimeFormat);
    2629
Note: See TracChangeset for help on using the changeset viewer.