IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42803


Ignore:
Timestamp:
May 7, 2025, 2:41:21 PM (15 months ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-ppmerge-20241229
Files:
50 edited
17 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ppmerge-20241229

  • branches/eam_branches/ipp-ppmerge-20241229/Nebulous/bin/whichnode

    r40387 r42803  
    1 #!/bin/env perl
     1#!/usr/bin/env perl
    22
    33# This script is a temporary "solution" to allow a client to determine whether

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/addstar/src/grefstars.c

    r41801 r42803  
    4141    catalog->average[N].R = ohana_normalize_angle (catalog->average[N].R);
    4242
     43    catalog->measure[N].McalPSF  = 0.0;
     44    catalog->measure[N].McalAPER = 0.0;
     45    catalog->measure[N].dMcal    = 0.0;
     46       
    4347    catalog->measure[N].R = catalog->average[N].R;
    4448    catalog->measure[N].D = catalog->average[N].D;

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libautocode/Makefile.Targets

    r40291 r42803  
    1818$(ASRC)/average-ps1-sim.$(ARCH).o \
    1919$(ASRC)/average-ps1-ref.$(ARCH).o \
     20$(ASRC)/average-ps1-ref-v2.$(ARCH).o \
     21$(ASRC)/average-ps1-ref-v3.$(ARCH).o \
    2022$(ASRC)/secfilt.$(ARCH).o \
    2123$(ASRC)/secfilt-loneos.$(ARCH).o \
    … …  
    3436$(ASRC)/secfilt-ps1-sim.$(ARCH).o \
    3537$(ASRC)/secfilt-ps1-ref.$(ARCH).o \
     38$(ASRC)/secfilt-ps1-ref-v2.$(ARCH).o \
     39$(ASRC)/secfilt-ps1-ref-v3.$(ARCH).o \
    3640$(ASRC)/measure.$(ARCH).o \
    3741$(ASRC)/measure-loneos.$(ARCH).o \
    … …  
    5054$(ASRC)/measure-ps1-sim.$(ARCH).o \
    5155$(ASRC)/measure-ps1-ref.$(ARCH).o \
     56$(ASRC)/measure-ps1-ref-v2.$(ARCH).o \
     57$(ASRC)/measure-ps1-ref-v3.$(ARCH).o \
    5258$(ASRC)/lensing.$(ARCH).o \
    5359$(ASRC)/lensing-ps1-v5-r0.$(ARCH).o \
    … …  
    8692$(ASRC)/photcode-ps1-v5-ld.$(ARCH).o \
    8793$(ASRC)/photcode-ps1-ref.$(ARCH).o \
     94$(ASRC)/photcode-ps1-ref-v2.$(ARCH).o \
     95$(ASRC)/photcode-ps1-ref-v3.$(ARCH).o \
    8896$(ASRC)/image-loneos.$(ARCH).o \
    8997$(ASRC)/image-elixir.$(ARCH).o \
    … …  
    102110$(ASRC)/image-ps1-sim.$(ARCH).o \
    103111$(ASRC)/image-ps1-ref.$(ARCH).o \
     112$(ASRC)/image-ps1-ref-v2.$(ARCH).o \
     113$(ASRC)/image-ps1-ref-v3.$(ARCH).o \
    104114$(ASRC)/regimage.$(ARCH).o \
    105115$(ASRC)/detreg.$(ARCH).o \
    … …  
    149159$(AINC)/average-ps1-sim.h \
    150160$(AINC)/average-ps1-ref.h \
     161$(AINC)/average-ps1-ref-v2.h \
     162$(AINC)/average-ps1-ref-v3.h \
    151163$(AINC)/secfilt.h \
    152164$(AINC)/secfilt-loneos.h \
    … …  
    165177$(AINC)/secfilt-ps1-sim.h \
    166178$(AINC)/secfilt-ps1-ref.h \
     179$(AINC)/secfilt-ps1-ref-v2.h \
     180$(AINC)/secfilt-ps1-ref-v3.h \
    167181$(AINC)/measure.h \
    168182$(AINC)/measure-loneos.h \
    … …  
    181195$(AINC)/measure-ps1-sim.h \
    182196$(AINC)/measure-ps1-ref.h \
     197$(AINC)/measure-ps1-ref-v2.h \
     198$(AINC)/measure-ps1-ref-v3.h \
    183199$(AINC)/lensing.h \
    184200$(AINC)/lensing-ps1-v5-r0.h \
    … …  
    217233$(AINC)/photcode-ps1-v5-ld.h \
    218234$(AINC)/photcode-ps1-ref.h \
     235$(AINC)/photcode-ps1-ref-v2.h \
     236$(AINC)/photcode-ps1-ref-v3.h \
    219237$(AINC)/image-loneos.h \
    220238$(AINC)/image-elixir.h \
    … …  
    233251$(AINC)/image-ps1-sim.h \
    234252$(AINC)/image-ps1-ref.h \
     253$(AINC)/image-ps1-ref-v2.h \
     254$(AINC)/image-ps1-ref-v3.h \
    235255$(AINC)/regimage.h \
    236256$(AINC)/detreg.h \

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/Makefile

    r42477 r42803  
    5353$(DESTINC)/ps1_v5_ld_defs.h \
    5454$(DESTINC)/ps1_ref_defs.h \
     55$(DESTINC)/ps1_ref_v2_defs.h \
     56$(DESTINC)/ps1_ref_v3_defs.h \
    5557$(DESTINC)/ps1_sim_defs.h \
    5658$(DESTINC)/cmf-ps1-dv3.h \
    … …  
    105107$(SRC)/dvo_convert_PS1_V5_LOAD.$(ARCH).o \
    106108$(SRC)/dvo_convert_PS1_REF.$(ARCH).o \
     109$(SRC)/dvo_convert_PS1_REF_V2.$(ARCH).o \
     110$(SRC)/dvo_convert_PS1_REF_V3.$(ARCH).o \
    107111$(SRC)/dvo_convert_PS1_SIM.$(ARCH).o \
    108112$(SRC)/flatcorr_io.$(ARCH).o    \

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/include/dvo.h

    r42477 r42803  
    2727  DVO_FORMAT_PS1_DEV_3,
    2828  DVO_FORMAT_PS1_REF,
     29  DVO_FORMAT_PS1_REF_V2,
     30  DVO_FORMAT_PS1_REF_V3,
    2931  DVO_FORMAT_PS1_SIM,
    3032  DVO_FORMAT_PS1_V1,
    … …  
    251253
    252254  ID_SECF_OBJ_EXT                = 0x01000000, // extended in this band
     255
     256  //ID_SECF_PHO_SYNTH            = 0x00000001, // this photcode has SYNTH photometry, turn on only for reference catalog
     257  //ID_SECF_PHO_ATLAS            = 0x00000002, // this photcode has ATLAS photometry, turn on only for reference catalog
     258  //ID_SECF_PHO_PV3              = 0x00000004, // this photcode has PV3   photometry, turn on only for reference catalog
     259  //ID_SECF_PHO_SOUTH            = 0x00000008, // this photcode has SOUTH photometry, turn on only for reference catalog
    253260
    254261  ID_SECF_CHIP_FLAGS             = 0x01003f1f, // all chip-related bits (used to reset the correct bits only)
    … …  
    10871094# include "ps1_v5_ld_defs.h"
    10881095# include "ps1_ref_defs.h"
     1096# include "ps1_ref_v2_defs.h"
     1097# include "ps1_ref_v3_defs.h"
    10891098# include "ps1_sim_defs.h"
    10901099

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

    r40291 r42803  
    5959  CONVERT_FORMAT("DVO_PHOTCODE_PS1_DEV_3",   PS1_DEV_3);
    6060  CONVERT_FORMAT("DVO_PHOTCODE_PS1_REF",     PS1_REF);
     61  CONVERT_FORMAT("DVO_PHOTCODE_PS1_REF_V2",  PS1_REF_V2);
     62  CONVERT_FORMAT("DVO_PHOTCODE_PS1_REF_V3",  PS1_REF_V3);
    6163  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V1",      PS1_V1);
    6264  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V2",      PS1_V2);

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/dvo_catalog.c

    r40291 r42803  
    6060  if (!strcasecmp (catformat, "PS1_V5_LOAD"))     return (DVO_FORMAT_PS1_V5_LOAD);
    6161  if (!strcasecmp (catformat, "PS1_REF"))         return (DVO_FORMAT_PS1_REF);
     62  if (!strcasecmp (catformat, "PS1_REF_V2"))      return (DVO_FORMAT_PS1_REF_V2);
     63  if (!strcasecmp (catformat, "PS1_REF_V3"))      return (DVO_FORMAT_PS1_REF_V3);
    6264  if (!strcasecmp (catformat, "PS1_SIM"))         return (DVO_FORMAT_PS1_SIM);
    6365  return (DVO_FORMAT_UNDEF);

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r40291 r42803  
    9494      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    9595      FORMAT_CASE (PS1_REF,     PS1_REF);
     96      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     97      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    9698      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    9799
    … …  
    292294  if (catalog[0].catformat == DVO_FORMAT_PS1_V5_LOAD)     gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD");
    293295  if (catalog[0].catformat == DVO_FORMAT_PS1_REF)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF");
     296  if (catalog[0].catformat == DVO_FORMAT_PS1_REF_V2)      gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF_V2");
     297  if (catalog[0].catformat == DVO_FORMAT_PS1_REF_V3)      gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF_V3");
    294298  if (catalog[0].catformat == DVO_FORMAT_PS1_SIM)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    295299
    … …  
    399403      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    400404      FORMAT_CASE (PS1_REF,     PS1_REF);
     405      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     406      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    401407      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    402408
    … …  
    454460      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    455461      FORMAT_CASE (PS1_REF,     PS1_REF);
     462      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     463      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    456464      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    457465
    … …  
    512520      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    513521      FORMAT_CASE (PS1_REF,     PS1_REF);
     522      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     523      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    514524      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    515525
    … …  
    567577      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    568578      FORMAT_CASE (PS1_REF,     PS1_REF);
     579      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     580      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    569581      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    570582
    … …  
    626638      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    627639      FORMAT_CASE (PS1_REF,     PS1_REF);
     640      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     641      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    628642      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    629643
    … …  
    681695      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    682696      FORMAT_CASE (PS1_REF,     PS1_REF);
     697      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
     698      FORMAT_CASE (PS1_REF_V3,  PS1_REF_V3);
    683699      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    684700

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/dvo_convert.c

    r40291 r42803  
    4545  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD",     PS1_V5_LOAD);
    4646  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF);
     47  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V2",      PS1_REF_V2);
     48  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V3",      PS1_REF_V3);
    4749  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM);
    4850# undef CONVERT_FORMAT
    … …  
    137139  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    138140  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF,         PS1_REF);
     141  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     142  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    139143  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    140144# undef CONVERT_FORMAT
    … …  
    176180      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    177181      FORMAT_CASE (PS1_REF,         PS1_REF);
     182      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     183      FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    178184      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    179185# undef FORMAT_CASE
    … …  
    276282  CONVERT_FORMAT ("DVO_MEASURE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD,     TRUE);
    277283  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF",         PS1_REF,         PS1_REF,         FALSE);
     284  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2,      FALSE);
     285  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3,      FALSE);
    278286  CONVERT_FORMAT ("DVO_MEASURE_PS1_SIM",         PS1_SIM,         PS1_SIM,         TRUE);
    279287# undef CONVERT_FORMAT
    … …  
    317325      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD,     TRUE);
    318326      FORMAT_CASE (PS1_REF,         PS1_REF,         FALSE);
     327      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2,      FALSE);
     328      FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3,      FALSE);
    319329      FORMAT_CASE (PS1_SIM,         PS1_SIM,         TRUE);
    320330# undef FORMAT_CASE
    … …  
    385395  SKIPPING_FORMAT ("DVO_MISSING_PS1_SIM",         PS1_SIM,         PS1_SIM);
    386396  SKIPPING_FORMAT ("DVO_MISSING_PS1_REF",         PS1_REF,         PS1_REF);
     397  SKIPPING_FORMAT ("DVO_MISSING_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     398  SKIPPING_FORMAT ("DVO_MISSING_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    387399  SKIPPING_FORMAT ("DVO_MISSING_ELIXIR",          ELIXIR,          Elixir);
    388400  SKIPPING_FORMAT ("DVO_MISSING_LONEOS",          LONEOS,          Loneos);
    … …  
    475487  CONVERT_FORMAT ("DVO_SECFILT_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    476488  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF",         PS1_REF,         PS1_REF);
     489  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     490  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    477491  CONVERT_FORMAT ("DVO_SECFILT_PS1_SIM",         PS1_SIM,         PS1_SIM);
    478492# undef CONVERT_FORMAT
    … …  
    514528      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    515529      FORMAT_CASE (PS1_REF,         PS1_REF);
     530      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     531      FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    516532      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    517533# undef FORMAT_CASE
    … …  
    609625
    610626  SKIPPING_FORMAT ("DVO_LENSING_PS1_REF",         PS1_REF,         PS1_REF);
     627  SKIPPING_FORMAT ("DVO_LENSING_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     628  SKIPPING_FORMAT ("DVO_LENSING_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    611629  SKIPPING_FORMAT ("DVO_LENSING_ELIXIR",          ELIXIR,          Elixir);
    612630  SKIPPING_FORMAT ("DVO_LENSING_LONEOS",          LONEOS,          Loneos);
    … …  
    650668
    651669//    FORMAT_CASE (PS1_REF,         PS1_REF);
     670//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     671//    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    652672//    FORMAT_CASE (ELIXIR,          Elixir);
    653673//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    731751
    732752  SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_REF",         PS1_REF,         PS1_REF);
     753  SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     754  SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    733755  SKIPPING_FORMAT ("DVO_LENSOBJ_ELIXIR",          ELIXIR,          Elixir);
    734756  SKIPPING_FORMAT ("DVO_LENSOBJ_LONEOS",          LONEOS,          Loneos);
    … …  
    772794
    773795//    FORMAT_CASE (PS1_REF,         PS1_REF);
     796//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     797//    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    774798//    FORMAT_CASE (ELIXIR,          Elixir);
    775799//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    841865  CONVERT_FORMAT  ("DVO_STARPAR_PS1_SIM",         PS1_SIM,         PS1_SIM);
    842866  SKIPPING_FORMAT ("DVO_STARPAR_PS1_REF",         PS1_REF,         PS1_REF);
     867  SKIPPING_FORMAT ("DVO_STARPAR_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     868  SKIPPING_FORMAT ("DVO_STARPAR_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    843869  SKIPPING_FORMAT ("DVO_STARPAR_ELIXIR",          ELIXIR,          Elixir);
    844870  SKIPPING_FORMAT ("DVO_STARPAR_LONEOS",          LONEOS,          Loneos);
    … …  
    882908      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    883909//    FORMAT_CASE (PS1_REF,         PS1_REF);
     910//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     911//    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    884912//    FORMAT_CASE (ELIXIR,          Elixir);
    885913//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    964992
    965993  SKIPPING_FORMAT ("DVO_GALPHOT_PS1_REF",         PS1_REF,         PS1_REF);
     994  SKIPPING_FORMAT ("DVO_GALPHOT_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     995  SKIPPING_FORMAT ("DVO_GALPHOT_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    966996  SKIPPING_FORMAT ("DVO_GALPHOT_ELIXIR",          ELIXIR,          Elixir);
    967997  SKIPPING_FORMAT ("DVO_GALPHOT_LONEOS",          LONEOS,          Loneos);
    … …  
    10051035
    10061036//    FORMAT_CASE (PS1_REF,         PS1_REF);
     1037//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     1038//    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    10071039//    FORMAT_CASE (ELIXIR,          Elixir);
    10081040//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    10941126  CONVERT_FORMAT ("DVO_IMAGE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    10951127  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF",         PS1_REF,         PS1_REF);
     1128  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
     1129  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF_V3",      PS1_REF_V3,      PS1_REF_V3);
    10961130  CONVERT_FORMAT ("DVO_IMAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    10971131
    … …  
    11351169    FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    11361170    FORMAT_CASE (PS1_REF,         PS1_REF);
     1171    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     1172    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    11371173    FORMAT_CASE (PS1_SIM,         PS1_SIM);
    11381174
    … …  
    11881224    FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    11891225    FORMAT_CASE (PS1_REF,         PS1_REF);
     1226    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
     1227    FORMAT_CASE (PS1_REF_V3,      PS1_REF_V3);
    11901228    FORMAT_CASE (PS1_SIM,         PS1_SIM);
    11911229

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/dvo_image.c

    r40291 r42803  
    226226  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD");
    227227  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF");
     228  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF_V2");
     229  if (db[0].format == DVO_FORMAT_PS1_REF_V3)      gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF_V3");
    228230  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    229231 

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/libdvo/src/dvo_image_raw.c

    r40291 r42803  
    6363  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     ImageSize = sizeof(Image_PS1_V5_LOAD);
    6464  if (db[0].format == DVO_FORMAT_PS1_REF)         ImageSize = sizeof(Image_PS1_REF);
     65  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      ImageSize = sizeof(Image_PS1_REF_V2);
     66  if (db[0].format == DVO_FORMAT_PS1_REF_V3)      ImageSize = sizeof(Image_PS1_REF_V3);
    6567  if (db[0].format == DVO_FORMAT_PS1_SIM)         ImageSize = sizeof(Image_PS1_SIM);
    6668
    … …  
    9799  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     gfits_table_mkheader_Image_PS1_V5_LOAD (&db[0].theader);
    98100  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_table_mkheader_Image_PS1_REF (&db[0].theader);
     101  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      gfits_table_mkheader_Image_PS1_REF_V2 (&db[0].theader);
     102  if (db[0].format == DVO_FORMAT_PS1_REF_V3)      gfits_table_mkheader_Image_PS1_REF_V3 (&db[0].theader);
    99103  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_table_mkheader_Image_PS1_SIM (&db[0].theader);
    100104   

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/Makefile

    r42112 r42803  
    8282$(SRC)/setExclusions.$(ARCH).o   \
    8383$(SRC)/setMrelFinal.$(ARCH).o    \
    84 $(SRC)/setMrelCatalog.$(ARCH).o          \
    85 $(SRC)/BoundaryTreeOps.$(ARCH).o         \
     84$(SRC)/setMrelCatalog.$(ARCH).o   \
     85$(SRC)/BoundaryTreeOps.$(ARCH).o  \
     86$(SRC)/DumpAllMags.$(ARCH).o      \
    8687$(SRC)/write_coords.$(ARCH).o
    8788

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/include/relphot.h

    r42389 r42803  
    160160  float dY; // bin = int(Ychip * dY), dY = Ny / NyChip
    161161  // NxChip, NyChip = 4900,4900 for now
     162
     163    int **nAlloc; // allocated vector length
     164  double ***dMval; // values used to calculate corrections
    162165} GridCorrectionType;
    163166
    … …  
    607610void          initGridBins        PROTO((void));
    608611GridCorrectionType *getGridCorrByCode PROTO((int code));
     612GridCorrectionType *newGridCorrByCode PROTO((int code));
    609613GridCorrectionType *getGridCorrNext   PROTO((int *Nlast));
    610614int           GridCorrectionSave  PROTO((void));
    … …  
    894898double get_median_zpt_tgroups (short photcode);
    895899void   set_median_zpt_tgroups (short photcode, double zpt);
     900
     901int DumpAllMags(char *filename, Catalog *catalog, int Ncatalog);

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/src/GridIO.c

    r41647 r42803  
    151151
    152152    if (!gfits_scan (&header, "PHOTCODE", "%d", 1, &photcode))    myAbort ("failed to get PHOTCODE");
    153     GridCorrectionType *GridCorr = getGridCorrByCode (photcode);
     153    GridCorrectionType *GridCorr = newGridCorrByCode (photcode);
    154154    GridCorr->photcode = photcode;
    155155

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/src/GridOps.c

    r41664 r42803  
    3030# define NX_CHIP_DEFAULT 1000
    3131# define NY_CHIP_DEFAULT 1000
    32 # define NX_BIN_DEFAULT 2
    33 # define NY_BIN_DEFAULT 2
     32# define NX_BIN_DEFAULT 4
     33# define NY_BIN_DEFAULT 4
    3434
    3535void initGridBins (void) {
    … …  
    7676      if (GridCorr[code]->dMgrid) FREE (GridCorr[code]->dMgrid[ix]);
    7777      if (GridCorr[code]->nMgrid) FREE (GridCorr[code]->nMgrid[ix]);
     78      if (GridCorr[code]->nAlloc) FREE (GridCorr[code]->nAlloc[ix]);
     79
     80      // dMval is a 2D array of vectors
     81      for (int iy = 0; iy < GridCorr[code]->Ny; iy++) {
     82        FREE (GridCorr[code]->dMval[ix][iy]);
     83      }
     84      FREE (GridCorr[code]->dMval[ix]);
    7885    }     
    7986
    … …  
    8188    FREE (GridCorr[code]->dMgrid);
    8289    FREE (GridCorr[code]->nMgrid);
     90    FREE (GridCorr[code]->nAlloc);
     91    FREE (GridCorr[code]-> dMval);
    8392
    8493    FREE(GridCorr[code]);
    … …  
    109118}
    110119
    111 GridCorrectionType *getGridCorrByCode (int code) {
     120// generate a new GridCorr structure in the array
     121GridCorrectionType *newGridCorrByCode (int code) {
    112122
    113123  if (GridCorr == NULL) return NULL;
    … …  
    116126  if (code <          0) return NULL;
    117127
     128  myAssert (GridCorr[code] == NULL, "oops, should not already be allocated!");
    118129  ALLOCATE(GridCorr[code], GridCorrectionType, 1)
     130  GridCorrectionType *result = GridCorr[code];
     131  return result;
     132}
     133
     134// return the GridCode structure corresponding to 'code'
     135GridCorrectionType *getGridCorrByCode (int code) {
     136
     137  if (GridCorr == NULL) return NULL;
     138
     139  if (code >= NGridCorr) return NULL;
     140  if (code <          0) return NULL;
     141
    119142  GridCorrectionType *result = GridCorr[code];
    120143  return result;
    … …  
    163186    // we are normally accessing this array randomly, so there is no advantage to
    164187    // doing Mgrid[y][x] vs Mgrid[x][y]
     188    ALLOCATE (GridCorr[code]-> dMval, double **, NX_BIN);
    165189    ALLOCATE (GridCorr[code]-> Mgrid, float *, NX_BIN);
    166190    ALLOCATE (GridCorr[code]->dMgrid, float *, NX_BIN);
    167191    ALLOCATE (GridCorr[code]->nMgrid,   int *, NX_BIN);
     192    ALLOCATE (GridCorr[code]->nAlloc,   int *, NX_BIN);
    168193    for (int ix = 0; ix < NX_BIN; ix++) {
    169194      ALLOCATE (GridCorr[code]-> Mgrid[ix], float, NY_BIN);
    170195      ALLOCATE (GridCorr[code]->dMgrid[ix], float, NY_BIN);
    171196      ALLOCATE (GridCorr[code]->nMgrid[ix],   int, NY_BIN);
     197      ALLOCATE (GridCorr[code]->nAlloc[ix],   int, NY_BIN);
     198
     199      // when we first allocate this array, set the elements to 0 (NULL)
     200      // these arrays will be allocated or reallocated in resetMgrid
     201      ALLOCATE_ZERO (GridCorr[code]-> dMval[ix], double *, NX_BIN);
    172202    }     
    173203  }
    … …  
    190220        GridCorr[code]->dMgrid[ix][iy] = 0.0;
    191221        GridCorr[code]->nMgrid[ix][iy] =   0;
     222        GridCorr[code]->nAlloc[ix][iy] = 100;
     223
     224        // allocate or reset vector length to default
     225        if (GridCorr[code]->dMval[ix][iy]) {
     226          REALLOCATE (GridCorr[code]->dMval[ix][iy], double, GridCorr[code]->nAlloc[ix][iy]);
     227        } else {
     228          ALLOCATE (GridCorr[code]->dMval[ix][iy], double, GridCorr[code]->nAlloc[ix][iy]);
     229        }
    192230      }
    193231    }     
    … …  
    263301        if (fabs(dM) > 0.5) continue;
    264302
    265         grid-> Mgrid[ix][iy] += dM;
    266         grid->dMgrid[ix][iy] += dM*dM;
     303        int ival = grid->nMgrid[ix][iy];
     304        grid-> dMval[ix][iy][ival] = dM;
    267305        grid->nMgrid[ix][iy] ++;
     306        CHECK_REALLOCATE (grid-> dMval[ix][iy], double, grid->nAlloc[ix][iy], grid->nMgrid[ix][iy], 100);
     307
     308        /* XXX old code to calculate simple means:
     309           grid-> Mgrid[ix][iy] += dM;
     310           grid->dMgrid[ix][iy] += dM*dM;
     311           grid->nMgrid[ix][iy] ++;
     312        */
    268313      }
    269314    }
    270315  }
     316
     317  StatType stats;
     318  liststats_setmode (&stats, "MEDIAN");
     319
     320  // now calculate Mgrid, dMgrid, nMgrid from Sum, Sum, Npt
     321  for (int code = 0; code < NGridCorr; code++) {
     322    if (!GridCorr[code]) continue;
     323
     324    for (int ix = 0; ix < GridCorr[code]->Nx; ix++) {
     325      for (int iy = 0; iy < GridCorr[code]->Ny; iy++) {
     326
     327        // cells without sufficient coverage stay at 0.0
     328        if (GridCorr[code]->nMgrid[ix][iy] < 5) {
     329          GridCorr[code]-> Mgrid[ix][iy] = 0.0;
     330          GridCorr[code]->dMgrid[ix][iy] = 0.0;
     331          continue;
     332        }
     333
     334        liststats_init (&stats);
     335
     336        liststats (GridCorr[code]->dMval[ix][iy], NULL, NULL, GridCorr[code]->nMgrid[ix][iy], &stats);
     337        double altSigma = (stats.Upper80 - stats.Lower20) / 1.6;  // 20% to 80% encompasses 60% of the values, corresponds to the range (-0.85 sigma : +0.85 sigma)
     338
     339        GridCorr[code]-> Mgrid[ix][iy] = stats.median;
     340        GridCorr[code]->dMgrid[ix][iy] = altSigma; // sample stdev
     341      }
     342    }
     343  }
     344  return;
     345}
     346
     347# if (0)
    271348
    272349  // now calculate Mgrid, dMgrid, nMgrid from Sum, Sum, Npt
    … …  
    300377    // float GridAve = GridSum / GridCnt;
    301378    // fprintf (stderr, "grid average: %f\n", GridAve);
    302   }
    303   return;
    304 }
     379# endif
    305380
    306381float getMgrid (Measure *measure) {

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/src/MagResidSave.c

    r41647 r42803  
    5454  gfits_create_table_header (&theader, "BINTABLE", "MAG_PSF_RESID");
    5555
    56   gfits_define_bintable_column (&theader, "D", "RA",       "ra",                         "degree", 1.0, 0.0);
    57   gfits_define_bintable_column (&theader, "D", "DEC",      "dec",                        "degree", 1.0, 0.0);
    58   gfits_define_bintable_column (&theader, "E", "MAG_RESID", "magnitude residual", "magnitudes", 1.0, 0.0);
    59   gfits_define_bintable_column (&theader, "E", "MAG_ERROR", "magnitude error", "magnitudes", 1.0, 0.0);
    60   gfits_define_bintable_column (&theader, "E", "MAG_CHISQ", "magnitude resid chisq", "unitless", 1.0, 0.0);
    61   gfits_define_bintable_column (&theader, "E", "MAG_MEDIAN", "median magnitude residual", "magnitudes", 1.0, 0.0);
     56  gfits_define_bintable_column (&theader, "D", "RA",         "ra",                           "degree",    1.0, 0.0);
     57  gfits_define_bintable_column (&theader, "D", "DEC",        "dec",                          "degree",    1.0, 0.0);
     58  gfits_define_bintable_column (&theader, "E", "MAG_RESID",  "magnitude residual",          "magnitudes", 1.0, 0.0);
     59  gfits_define_bintable_column (&theader, "E", "MAG_ERROR",  "magnitude error",              "magnitudes", 1.0, 0.0);
     60  gfits_define_bintable_column (&theader, "E", "MAG_CHISQ",  "magnitude resid chisq",        "unitless",  1.0, 0.0);
     61  gfits_define_bintable_column (&theader, "E", "MAG_MEDIAN", "median magnitude residual",    "magnitudes", 1.0, 0.0);
    6262  gfits_define_bintable_column (&theader, "E", "MAG_ALTSIG", "68 percentile range as sigma", "magnitudes", 1.0, 0.0);
    63   gfits_define_bintable_column (&theader, "E", "AIRMASS",   "", "unitless", 1.0, 0.0);
    64   gfits_define_bintable_column (&theader, "D", "MJD",       "", "unitless", 1.0, 0.0);
    65   gfits_define_bintable_column (&theader, "E", "EXPTIME",   "", "unitless", 1.0, 0.0);
    66   gfits_define_bintable_column (&theader, "J", "PHOTCODE",  "", "unitless", 1.0, 0.0);
    67   gfits_define_bintable_column (&theader, "J", "FLAGS",     "image flags", "unitless",   1.0, 0.0);
    68   gfits_define_bintable_column (&theader, "J", "NFIT",      "number of stars fitted", NULL, 1.0, FT_BZERO_INT32);
    69   gfits_define_bintable_column (&theader, "J", "NMEAS",     "number of stars on image", NULL, 1.0, FT_BZERO_INT32);
     63  gfits_define_bintable_column (&theader, "E", "AIRMASS",    "",                             "unitless",  1.0, 0.0);
     64  gfits_define_bintable_column (&theader, "D", "MJD",        "",                             "unitless",  1.0, 0.0);
     65  gfits_define_bintable_column (&theader, "E", "EXPTIME",    "",                             "unitless",  1.0, 0.0);
     66  gfits_define_bintable_column (&theader, "J", "PHOTCODE",   "",                             "unitless",  1.0, 0.0);
     67  gfits_define_bintable_column (&theader, "J", "FLAGS",      "image flags",                  "unitless",   1.0, 0.0);
     68  gfits_define_bintable_column (&theader, "J", "NFIT",       "number of stars fitted",       NULL,         1.0, 0.0);
     69  gfits_define_bintable_column (&theader, "J", "NMEAS",      "number of stars on image",     NULL,         1.0, 0.0);
    7070
    7171  // generate the output array that carries the data

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/src/relphot_images.c

    r42132 r42803  
    147147    MagResidSave ("mag.resid.fits", catalog);
    148148
     149    // DumpAllMags ("all.mags.fits", catalog, Ncatalog);
     150
    149151    save_images_updates (&db);
    150152

  • branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/relphot/src/setMrelCatalog.c

    r42551 r42803  
    412412      secfilt[Nsec].flags |= ID_SECF_HAS_CFH;
    413413    }
     414//  secfilt[Nsec].flags |= ID_SECF_AST_GAIA ; // for building reference catalog only, STAR_FEW need to comment out
     415//  secfilt[Nsec].flags |= ID_SECF_PHO_SYNTH; // for building reference catalog only, STAR_FEW need to comment out
     416//  secfilt[Nsec].flags |= ID_SECF_PHO_ATLAS; // for building reference catalog only, STAR_FEW need to comment out
     417//  secfilt[Nsec].flags |= ID_SECF_PHO_PV3  ; // for building reference catalog only, STAR_FEW need to comment out
     418//  secfilt[Nsec].flags |= ID_SECF_PHO_SOUTH; // for building reference catalog only, STAR_FEW need to comment out
    414419
    415420    // if -preserve-ps1 is set and this object has PS1 data, skip the rest of the steps:

  • branches/eam_branches/ipp-ppmerge-20241229/PS-IPP-Config

  • branches/eam_branches/ipp-ppmerge-20241229/PS-IPP-Config/lib/PS/IPP/Config.pm

    r40494 r42803  
    13681368
    13691369
     1370# Return array of the instances for this nebulous file
     1371sub find_instances
     1372{
     1373    my $self = shift;
     1374    my $file = shift;
     1375
     1376    my $scheme = file_scheme($file);
     1377    if (!$scheme or ($scheme ne 'neb')) {
     1378        # if not nebulous, the instance is the file
     1379        my @result;
     1380        push @result, $file;
     1381        return (\@result);
     1382    }
     1383
     1384    my $neb = $self->nebulous;
     1385    my $uris;
     1386    eval { $uris = $neb->find_instances($file); };
     1387    if ($@) {
     1388        carp "failed to set user.copies for $file";
     1389        return 0;
     1390    }
     1391    return $uris;
     1392}
     1393
    13701394# Return catdir for tessellation, from TESSELLATIONS within the site configuration
    13711395sub tessellation_catdir

  • branches/eam_branches/ipp-ppmerge-20241229/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

    r42392 r42803  
    312312                    cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
    313313               if(cell[j].burn[k].nfit <= 0) continue;
     314               /*kick out burns which are single pixels*/
    314315             }
    315316            } else {
    … …  
    317318               cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
    318319             if(cell[j].burn[k].nfit <= 0) continue;
     320             /*kick out burns which are single pixels*/
     321
    319322            }
    320323

  • branches/eam_branches/ipp-ppmerge-20241229/extsrc/gpcsw/gpcsrc/fits/burntool/stardetect.c

    r42724 r42803  
    3434   starcut = STAR_THRESH/2 + cell->sky + cell->bias;
    3535
    36    /*try a new value for thresh_lo which is 1 sigmas above the background, but with a safety limit of 1000 counts*/
     36   /*try a new value for thresh_lo which is 10 sigmas above the background, but with a safety limit of 1000 counts*/
    3737        trailthresh = cell->sky + (10*cell->rms);
    3838        if(trailthresh <= 1000) trailthresh = 1000;
    3939        trailthresh = trailthresh + cell->bias;
     40        thresh_lo = trailthresh;
     41
     42   /*try a new value for burnthresh which is twice the bias above the sky background, but with a safety limit of 30000 counts*/
     43        burnthresh = cell->sky + (2*cell->bias);
     44        if(burnthresh <= BURN_THRESH) burnthresh = BURN_THRESH;
     45        thresh_hi = burnthresh;
    4046
    4147/* Look at all the pixels which pass the burn threshold */
    … …  
    8187                boxbuf[nbox].ey = k-1;
    8288                grow_box(nx, ny, NX, data, thresh_lo, boxbuf+nbox);
     89               
    8390           /* Fill in max and center info */
    8491                boxbuf[nbox].max = 0;
    … …  
    100107                             boxbuf[nbox].ex, boxbuf[nbox].ey,
    101108                             boxbuf[nbox].max);
     109                        fflush(stdout);
     110                  }
     111/* Mark the veto mask so as not to trigger on this one again */
     112                  for(l=boxbuf[nbox].sy; l<=boxbuf[nbox].ey; l++) {
     113                         for(k=boxbuf[nbox].sx; k<=boxbuf[nbox].ex; k++) {
     114                          veto[k+l*NX] = boxbuf[nbox].max;
     115                         }
     116                  }
     117                  xon = -1;
     118                  continue;
     119                }
     120
     121/* A box that is composed of a single pixel should not be considered a burn */
     122                if((boxbuf[nbox].ex - boxbuf[nbox].sx) <= 2 && (boxbuf[nbox].ey - boxbuf[nbox].sy) <= 2) {
     123                  if(VERBOSE & VERB_DETECT) {
     124                        printf("Ditching box %d %d %d %d  for being too small\n",
     125                             boxbuf[nbox].sx, boxbuf[nbox].sy,
     126                             boxbuf[nbox].ex, boxbuf[nbox].ey);
    102127                        fflush(stdout);
    103128                  }

  • branches/eam_branches/ipp-ppmerge-20241229/extsrc/gpcsw/gpcsrc/fits/burntool/trailfit.c

    r42724 r42803  
    290290
    291291   if(!strcmp(camera,"gpc2")) {
    292 
    293292     /*Conpute the mean and standard deviation of the trail along x*/
    294293     for(i=xs; i<=xe; i++) {
    … …  
    384383     }
    385384     /* Update fit ranges */
    386      if(box->nfit > 0) {
     385     if(box->nfit > 1) {
    387386        box->sxfit = box->xfit[0];
    388387        box->exfit = box->xfit[box->nfit-1];

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/INSTALL

    r42384 r42803  
    3939# $CZARPLOTDIR and $METRICSPLOTDIR will be generated as links in the same folder as ippMonitor 
    4040# the structure of the names for these two directories are defined in Makefile.in a
    41 psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /some/path --site ~/ippconfig/ippmonitor.config
     41# pltdir is for ippMetrics and czartool_plots hyperlinked from /export/ipp113.0/ipp/ in /var/www/localhost/htdocs/ippMonitor
     42# pltdir in ipp117 is /var/www/localhost/htdocs/ippMonitor
     43# ippMetrics -> /export/ipp113.0/ipp/ippMetrics/
     44# czartool_plots -> /export/ipp113.0/ipp/czartool_plots/
     45psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /var/www/localhost/htdocs/ippMonitor --site ~/ippconfig/ippmonitor.config
    4246
    4347## NOTES:

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/Makefile.in

    r42736 r42803  
    9292$(DESTWWW)/scatterPlotAirmassMcal.php \
    9393$(DESTWWW)/scatterPlotDataQuality.php \
     94$(DESTWWW)/dataquality.php \
     95$(DESTWWW)/pointing.php \
    9496$(DESTWWW)/loader.js
    9597

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/czartool/czarpoll.pl

    r41302 r42803  
    380380        }
    381381
     382        # check ippdb host IPP-2338
     383        print "* Checking ippdb hosts\n";
     384        my @hosts = qw(ipphome0 ipphome1 ippdb01 ippdb05 ippdb06 ippdb09 ippdb11 ippdb12 ippdb13 ippdb14);
     385        if($dbupdate == 1) {check_disk_usage_and_update($czarDb, @hosts);}
     386
    382387        # check pantasks status
    383388        if($dbupdate == 1) {updateServerStatus();}
    … …  
    604609}
    605610
     611###########################################################################
     612#
     613# Loops through given host and update to the host list
     614#
     615###########################################################################
     616sub check_disk_usage_and_update {
     617    my ($czarDb, @hosts) = @_;
     618
     619    foreach my $host (@hosts) {
     620        print "Checking $host...\n";
     621
     622        for my $suffix (0, 1) {
     623            my $mount_point = "/export/$host.$suffix";
     624
     625            # Use SSH to get disk stats
     626            my $df_output = `ssh $host df -k $mount_point 2>/dev/null`;
     627
     628            #if (!$df_output || $df_output !~ /\d/) {
     629            #    warn "Failed to get disk usage for $host on $mount_point\n";
     630            #    next;
     631            #}
     632
     633            my @lines = split /\n/, $df_output;
     634            my $line = $lines[1] || next;
     635
     636            my ($filesystem, $blocks, $used, $available, $percent, $mount) = split /\s+/, $line;
     637
     638            # Convert KB to TB
     639            my $total_tb     = sprintf("%.1f", $blocks    / 1024 / 1024 / 1024);
     640            my $used_tb      = sprintf("%.1f", $used      / 1024 / 1024 / 1024);
     641            my $available_tb = sprintf("%.1f", $available / 1024 / 1024 / 1024);
     642
     643            my $used_percent      = sprintf("%.3f", $used / $blocks * 100);
     644            my $available_percent = sprintf("%.3f", $available / $blocks * 100);
     645
     646            my $readable = 1;
     647            my $writable = 1;
     648
     649            #print "Mount $mount_point: total=${total_tb}TB, used=${used_tb}TB (${used_percent}%), available=${available_tb}TB (${available_percent}%)\n";
     650
     651            # Example: ippdb01.0(3.5T)
     652            my $host_label = "$host.$suffix(${total_tb}T)";
     653            $czarDb->updateHost($host_label, 100, $available_percent, $used_percent, $readable, $writable);
     654        }
     655    }
     656}

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/czartool/czartool/Nebulous.pm

    r39805 r42803  
    111111
    112112            next;
    113         } elsif (($line =~ m/(ipp[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
     113        } elsif (($line =~ m/(ipp[0-9]+(?:_bck)?\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
    114114               ($line =~ m/(ippb[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)
    115115# these nodes are gone

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/czartool/czartool/Pantasks.pm

    r41558 r42803  
    1010        "cleanup",
    1111        "distribution",
    12         "pstamp",
     12        "ippitc:pstamp",
    1313        "registration",
    1414        "stack",
    … …  
    2222        "ippqub:stdscience_ws",
    2323        "ippqub2:stdscience_ws",
     24        "ippsky:stdscience_ipp138",
    2425        "publishing",
    2526        "replication",
    … …  
    2728        );
    2829# current home dir of gpc1 and gpc2
    29 my $ipphome1 = "/home/panstarrs/ippitc";
     30my $ipphome1 = "/home/panstarrs/ippps1";
    3031my $ipphome2 = "/home/panstarrs/ippps2";
    3132

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/czartool/extra_labels.dat

    r41125 r42803  
    11## TdB20190626: add extra labels for processing in this file. Syntax is as follows: [labelname] [telescope]
    22## Priorities for the labels must be added to the priorities mySQL table for the relevant telescope, if desired.
    3 PV3.Pole.Reprocess.20180510 gpc1
     3## PV3.Pole.Reprocess.20180510 gpc1
    44ps_ud_QUB gpc1
     5## update.ipp138.fix gpc1
     6## update.ipp138.fix gpc2

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/raw/czartool_labels.php

    r42736 r42803  
    8787        "distribution",
    8888        "ippqub:stdscience_ws",
    89         "pstamp",
     89        "ippitc:pstamp",
    9090        "registration",
    9191//        "stack",
    … …  
    16681668    $qry = $db->query($sql);
    16691669    if (dberror($qry)) {echo "<b>error with $sql </b><br>\n";}
     1670
     1671    // Set environment variables
     1672    putenv("PATH=/usr/local/bin:/usr/bin:/bin:/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/bin");
     1673    putenv("PERL5LIB=/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/lib");
     1674
    16701675    # not sure why neb-host doesn't work on ipp113 CCL.20210216
    16711676    exec("neb-host |cut -b 17-30,86-", $hostnoteall);

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/raw/ipp.czar.dat

    r42276 r42803  
    55menulink   | menuselect      | link    | czartool               | czartool_labels.php
    66menulink   | menuselect      | link    | storage status         | storage.php
     7menulink   | menuselect      | link    | pointing               | pointing.php
     8menulink   | menuselect      | link    | data quality           | dataquality.php
    79menulink   | menuselect      | link    | mask stats             | maskStats.php
    810menulink   | menuselect      | link    | night summary          | nightSummary.php

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/raw/ipp.php

    r42736 r42803  
    982982}
    983983
    984 
    985 
    986984?>

  • branches/eam_branches/ipp-ppmerge-20241229/ippMonitor/scripts/czartool_getServerStatus.pl

    r41726 r42803  
    1919
    2020if ($proj eq 'gpc1') {
    21   $user = 'ippitc';
     21  $user = 'ippps1';
    2222} else {
    2323  $user = 'ippps2';
     24}
     25
     26my @cmdOut3 = `grep PANTASKS_SERVER ~$user/$server/ptolemy.rc |grep -v std | grep -v PORT 2>&1`;
     27my $line3;
     28foreach $line3 (@cmdOut3) {
     29    chomp($line3);
     30    print "$line3 \n";
    2431}
    2532
    … …  
    4047    my @fields = split /\s+/, $line2;
    4148
     49
    4250#    run job example
    4351# field0      1        2       3         4      5       6           7       8
    … …  
    5058    $nline = $nline + 1;
    5159}
     60
     61

  • branches/eam_branches/ipp-ppmerge-20241229/ippTasks/mergedvodb.pro

    r33030 r42803  
    77
    88
    9 #There is a book for each task, because I don't use labels.
     9#There is a book for each task, because I dont use labels.
    1010
    1111if (not($?havemergedvodbBooks))
    … …  
    4444end
    4545
    46 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
     46## you get no choice - you add all of them in at the same time. you can always turn off the tasks you dont want to run.
    4747macro add.mergedvodb
    4848  if ($0 != 2)

  • branches/eam_branches/ipp-ppmerge-20241229/ippTasks/summit.copy.pro

    r41734 r42803  
    4949macro summitcopy.reset
    5050    summitcopy.reset
     51end
     52
     53# pzgetexp is loading exposure files to summitExp
     54macro pzgetexp.on
     55  task pzgetexp
     56    active true
     57  end
     58end
     59
     60macro pzgetexp.off
     61  task pzgetexp
     62    active false
     63  end
    5164end
    5265

  • branches/eam_branches/ipp-ppmerge-20241229/ippTools

  • branches/eam_branches/ipp-ppmerge-20241229/ippTools/src

  • branches/eam_branches/ipp-ppmerge-20241229/ippTools/src/pxtools.c

    r34197 r42803  
    3636    if (!strcmp(state, "wait")) return true;
    3737    if (!strcmp(state, "keep")) return true;
     38    if (!strcmp(state, "ignore")) return true;
    3839    if (!strcmp(state, "goto_cleaned")) return true;
    3940    if (!strcmp(state, "error_cleaned")) return true;

  • branches/eam_branches/ipp-ppmerge-20241229/ippconfig

  • branches/eam_branches/ipp-ppmerge-20241229/ippconfig/Makefile.am

    r42729 r42803  
     1TGT  = $(PSCONFDIR)/$(PSCONFIG)/etc/compress.mgc
     2
    13SUBDIRS = \
    24        recipes \
    … …  
    3638built_files = \
    3739        ipprc.config \
    38         dvo.site
     40        dvo.site \
     41        $(TGT)
    3942
    4043installdir = $(datadir)/ippconfig
    … …  
    6467
    6568
    66 TGTDIR  = $(PSCONFDIR)/$(PSCONFIG)/etc
    67 SRC     =       compress
    68 TGT     =       $(TGTDIR)/compress.mgc
    69 
    70 install: $(TGT)
    71 build:   $(MGC)
    7269
    7370if HAVE_LINUX

  • branches/eam_branches/ipp-ppmerge-20241229/ppImage

  • branches/eam_branches/ipp-ppmerge-20241229/ppImage/src/ppImageBurntoolApply.c

    r42395 r42803  
    226226        /* do separate masking strategy for old (14 and lower) and new burntool tables*/
    227227        if (BURNTOOL_STATE_GOOD >= 15) {
    228          printf("DET: New burntool style %d\n",BURNTOOL_STATE_GOOD);
     228         /*printf("DET: New burntool style %d\n",BURNTOOL_STATE_GOOD);*/
    229229          for (int i = box->sxfit; i<= box->exfit; i++) {
    230230              if (box->up == 0) {
    … …  
    248248
    249249        } else {
    250          printf("DET: Old burntool style %d\n",BURNTOOL_STATE_GOOD);
     250        /* printf("DET: Old burntool style %d\n",BURNTOOL_STATE_GOOD);*/
    251251          for (int i = box->sxfit; i<= box->exfit; i++) {
    252252              if (box->up == 0) {

  • branches/eam_branches/ipp-ppmerge-20241229/psLib

  • branches/eam_branches/ipp-ppmerge-20241229/psLib/src/db/psDB.c

    r42771 r42803  
    10391039    fieldCount = mysql_num_fields(result);
    10401040
    1041     psTrace("psLib.db", PS_LOG_INFO, "query returned %lu rows with %d fields",             rowCount, fieldCount);
     1041    psTrace("psLib.db", PS_LOG_INFO, "query returned %lu rows with %d fields", (long unsigned int) rowCount, fieldCount);
    10421042
    10431043    while ((row = mysql_fetch_row(result))) {

  • branches/eam_branches/ipp-ppmerge-20241229/psconfig

  • branches/eam_branches/ipp-ppmerge-20241229/psconfig/tagsets/ipp-ubuntu.dist

    r42726 r42803  
    6868  YYYYY  ippScripts             ipp-2-9          -0
    6969  YYYYY  ippTasks               ipp-2-9          -0
    70 # YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
     70  YNYYY  ippToPsps              ipp-2-9          -0 : moved to $svn/psps
    7171         
    7272  YNYYN  psconfig               ipp-2-9          -0
    … …  
    8181
    8282  YYYYY  extsrc/gpcsw           ipp-2-9          -0
    83 # YYYYY  magic                  ipp-2-9          -0
    84 # YYYYY  magic/censorObjects    ipp-2-9          -0
    85 # YYYYY  magic/remove           ipp-2-9          -0
    86   YYYYY  console                ipp-2-9          -0
     83  YNYYY  magic                  ipp-2-9          -0
     84  YNYYY  magic/censorObjects    ipp-2-9          -0
     85  YNYYY  magic/remove           ipp-2-9          -0
     86  YNYYY  console                ipp-2-9          -0
    8787
    8888# there are externally required C libraries and perl modules (see INSTALL)
Note: See TracChangeset for help on using the changeset viewer.