IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34995


Ignore:
Timestamp:
Jan 19, 2013, 1:49:34 PM (14 years ago)
Author:
eugene
Message:

add skytable to dvopsps

Location:
branches/eam_branches/ipp-20121219/Ohana/src/dvopsps
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/Makefile

    r34921 r34995  
    2626$(SRC)/initialize_dvopsps.$(ARCH).o \
    2727$(SRC)/mysql_dvopsps.$(ARCH).o \
     28$(SRC)/insert_skytable.$(ARCH).o \
    2829$(SRC)/insert_detections_dvopsps.$(ARCH).o \
    2930$(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o
    … …  
    3839$(SRC)/initialize_dvopsps.$(ARCH).o \
    3940$(SRC)/mysql_dvopsps.$(ARCH).o \
     41$(SRC)/insert_skytable.$(ARCH).o \
    4042$(SRC)/insert_detections_dvopsps.$(ARCH).o \
    4143$(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/include/dvopsps.h

    r34921 r34995  
    4848MYSQL *mysql_dvopsps_connect              PROTO((MYSQL *mysqlBase));
    4949
    50 int    insert_detections_mysql            PROTO((Average *average, Measure *measure, MYSQL *mysql));
    51 
    5250int    insert_detections_mysql_commit     PROTO((IOBuffer *buffer, MYSQL *mysql));
    5351int    insert_detections_mysql_value      PROTO((IOBuffer *buffer, Average *average, Measure *measure));
    5452int    insert_detections_mysql_init       PROTO((IOBuffer *buffer));
     53
     54int    insert_skytable                    PROTO(());
     55
     56int    insert_skytable_mysql_commit       PROTO((IOBuffer *buffer, MYSQL *mysql));
     57int    insert_skytable_mysql_value        PROTO((IOBuffer *buffer, SkyRegion *region));
     58int    insert_skytable_mysql_init         PROTO((IOBuffer *buffer));

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/dvopsps.c

    r34916 r34995  
    88  initialize_dvopsps (argc, argv);
    99
    10   status = insert_detections_dvopsps ();
     10  status = -1;
     11  if (!strcasecmp (argv[1], "detections")) {
     12    status = insert_detections_dvopsps ();
     13  }
     14  if (!strcasecmp (argv[1], "skytable")) {
     15    status = insert_skytable ();
     16  }
     17 
     18  if (status == -1) {
     19    fprintf (stderr, "invalid mode, should be : detections, skytable\n");
     20    exit (2);
     21  }
    1122
    1223  if (!status) exit (1);

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/initialize_dvopsps.c

    r34918 r34995  
    22
    33void usage_dvopsps () {
    4   fprintf (stderr, "USAGE: dvopsps [dbinfo] [options]\n");
     4  fprintf (stderr, "USAGE: dvopsps (mode) [dbinfo] (mode) [options]\n");
    55  fprintf (stderr, "    mysql database info is supplied with these:\n");
    66  fprintf (stderr, "    -dbhost : database host machine\n");
    … …  
    132132  }
    133133
    134   if (argc != 1) usage_dvopsps();
     134  if (argc != 2) usage_dvopsps();
    135135
    136136  return (TRUE);
    … …  
    138138
    139139void usage_dvopsps_client () {
    140   fprintf (stderr, "USAGE: dvopsps_client [dbinfo] [hostinfo] [options]\n");
     140  fprintf (stderr, "USAGE: dvopsps_client (mode) [dbinfo] [hostinfo] [options]\n");
    141141  fprintf (stderr, "    dvo host info:\n");
    142142  fprintf (stderr, "    -hostID (ID)   : dvo host ID\n");
    … …  
    268268  if (!CATDIR) usage_dvopsps_client();
    269269
    270   if (argc != 1) usage_dvopsps_client();
     270  if (argc != 2) usage_dvopsps_client();
    271271  return (TRUE);
    272272}

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

    r34921 r34995  
    109109
    110110    char command[1024];
    111     snprintf (command, 1024, "dvopsps_client -hostID %d -catdir %s -hostdir %s -region %f %f %f %f",
     111    snprintf (command, 1024, "dvopsps_client detections -hostID %d -catdir %s -hostdir %s -region %f %f %f %f",
    112112              table->hosts[i].hostID, CATDIR, table->hosts[i].pathname,
    113113              UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

    r34936 r34995  
    2626
    2727  gettimeofday (&start, (void *) NULL);
    28 
    2928  insert_detections_mysql_init (&buffer);
    3029  int Ninsert = 0;
    … …  
    7776  }
    7877
     78// XXX I need to add the fileID (catID) here
     79
    7980# if (SQL_INSERT)
    8081  PrintIOBuffer (buffer, "INSERT INTO dvoDetection (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
    … …  
    9192  PrintIOBuffer (buffer, "    (%d, %u, %lu, %lu, %lu, %u, %f, %f, %f, %f, %lf, %lf, %f, %f),\n",
    9293# else
    93   PrintIOBuffer (buffer, "    %d %u %lu %lu %lu %u %f %f %f %f %lf %lf %f %f\n",
     94                PrintIOBuffer (buffer, "    %d %u %lu %lu %lu %u %f %f %f %f %lf %lf %f %f\n",
    9495# endif
    95           measure->imageID,    // imageID
    96           measure->detID,   // ippDetectID
    97           measure->extID,   // detectID
    98           ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
    99           average->extID,   // objID
    100           measure->dbFlags,  // flags
    101           code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal,   // zp
    102           measure->dMcal,    // zpErr
    103           measure->airmass,
    104           pow(10.0, 0.4 * measure->dt),    // expTime
    105           average->R - measure->dR / 3600.,    // ra
    106           average->D - measure->dR / 3600.,    // dec
    107           measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
    108           measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
    109     );
     96                                measure->imageID,    // imageID
     97                                measure->detID,   // ippDetectID
     98                                measure->extID,   // detectID
     99                                ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
     100                                average->extID,   // objID
     101                                measure->dbFlags,  // flags
     102                                code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal,   // zp
     103                                measure->dMcal,    // zpErr
     104                                measure->airmass,
     105                                pow(10.0, 0.4 * measure->dt),    // expTime
     106                                average->R - measure->dR / 3600.,    // ra
     107                                average->D - measure->dR / 3600.,    // dec
     108                                measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
     109                                measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
     110# if (SQL_INSERT)
     111                   );
     112# else
     113    );
     114# endif
    110115  return TRUE;
    111116}
    112 
     117   
    113118int insert_detections_mysql_commit (IOBuffer *buffer, MYSQL *mysql) {
    114119
Note: See TracChangeset for help on using the changeset viewer.