diff --git a/etc/ComCam/primary_hdu.header b/etc/ComCam/primary_hdu.header index eca7273b..3f3f7ce1 100644 --- a/etc/ComCam/primary_hdu.header +++ b/etc/ComCam/primary_hdu.header @@ -10,7 +10,6 @@ DATE = / Creation Date and Time of File DATE-OBS= / Date of the observation (image acquisition) DATE-BEG= / Time at the start of integration DATE-END= / end date of the observation -MJD = / Modified Julian Date that the file was written MJD-OBS = / Modified Julian Date of observation MJD-BEG = / Modified Julian Date derived from DATE-BEG MJD-END = / Modified Julian Date derived from DATE-END diff --git a/etc/GenericCamera-1/primary_hdu.header b/etc/GenericCamera-1/primary_hdu.header index bf6eec60..e9958952 100644 --- a/etc/GenericCamera-1/primary_hdu.header +++ b/etc/GenericCamera-1/primary_hdu.header @@ -10,7 +10,6 @@ DATE = / Creation Date and Time of File DATE-OBS= / Date of observation (image acquisition) DATE-BEG= / Time at the start of integration DATE-END= / end date of the observation -MJD = / Modified Julian Date that the file was written MJD-OBS = / Modified Julian Date of observation MJD-BEG = / Modified Julian Date derived from DATE-BEG MJD-END = / Modified Julian Date derived from DATE-END diff --git a/etc/GenericCamera-101/primary_hdu.header b/etc/GenericCamera-101/primary_hdu.header index 24062ccc..413a9e2a 100644 --- a/etc/GenericCamera-101/primary_hdu.header +++ b/etc/GenericCamera-101/primary_hdu.header @@ -10,7 +10,6 @@ DATE = / Creation Date and Time of File DATE-OBS= / Date of observation (image acquisition) DATE-BEG= / Time at the start of integration DATE-END= / end date of the observation -MJD = / Modified Julian Date that the file was written MJD-OBS = / Modified Julian Date of observation MJD-BEG = / Modified Julian Date derived from DATE-BEG MJD-END = / Modified Julian Date derived from DATE-END diff --git a/etc/LATISS/primary_hdu.header b/etc/LATISS/primary_hdu.header index 55504267..8cedd5e2 100644 --- a/etc/LATISS/primary_hdu.header +++ b/etc/LATISS/primary_hdu.header @@ -10,7 +10,6 @@ DATE = / Creation Date and Time of File DATE-OBS= / Date of the observation (image acquisition) DATE-BEG= / Time at the start of integration DATE-END= / end date of the observation -MJD = / Modified Julian Date that the file was written MJD-OBS = / Modified Julian Date of observation MJD-BEG = / Modified Julian Date derived from DATE-BEG MJD-END = / Modified Julian Date derived from DATE-END diff --git a/etc/LSSTCam/primary_hdu.header b/etc/LSSTCam/primary_hdu.header index 8afd4628..0367b230 100644 --- a/etc/LSSTCam/primary_hdu.header +++ b/etc/LSSTCam/primary_hdu.header @@ -10,7 +10,6 @@ DATE = / Creation Date and Time of File DATE-OBS= / Date of the observation (image acquisition) DATE-BEG= / Time at the start of integration DATE-END= / end date of the observation -MJD = / Modified Julian Date that the file was written MJD-OBS = / Modified Julian Date of observation MJD-BEG = / Modified Julian Date derived from DATE-BEG MJD-END = / Modified Julian Date derived from DATE-END diff --git a/python/HeaderService/__init__.py b/python/HeaderService/__init__.py index 3fc03929..8329b44f 100644 --- a/python/HeaderService/__init__.py +++ b/python/HeaderService/__init__.py @@ -20,7 +20,7 @@ # along with this program. If not, see . __author__ = "LSST/Felipe Menanteau" -__version__ = "3.5.8" +__version__ = "3.5.9" version = __version__ from . import hutils diff --git a/python/HeaderService/hslib_salobj.py b/python/HeaderService/hslib_salobj.py index 930f005e..2eb8b84d 100644 --- a/python/HeaderService/hslib_salobj.py +++ b/python/HeaderService/hslib_salobj.py @@ -1178,9 +1178,8 @@ def collect_from_HeaderService(self, imageName): # Store the creation date of the header file -- i.e. now!! DATE = hscalc.get_date(time.time()) metadata['DATE'] = DATE.isot - # Need to force MJD dates to floats for yaml header - metadata['MJD'] = float(DATE.mjd) + # Need to force MJD dates to floats for yaml header if 'DATE-OBS' in metadata: DATE_OBS = hscalc.get_date(metadata['DATE-OBS']) metadata['DATE-OBS'] = DATE_OBS.isot diff --git a/start_docker_dev.sh b/start_docker_dev.sh deleted file mode 100755 index 5c74132c..00000000 --- a/start_docker_dev.sh +++ /dev/null @@ -1,24 +0,0 @@ -HSUSER=headerservice -TAGNAME=6.1.0-10.2.0-salobj_6.9.0-hs_2.9.4 -DOCKER_IMA=lsstdm/headerservice:$TAGNAME -NAME=headerservice - -hostname="`hostname -s`-docker" -ip=$(ifconfig en0 | grep inet | awk '$1=="inet" {print $2}') -xhost + $ip - - -echo "starting docker with image: $DOCKER_IMA" -docker run -ti -e DISPLAY=$ip:0 \ - -h $hostname \ - --network host \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -v $HOME/sal-home:/home/$HSUSER \ - --name $NAME \ - $DOCKER_IMA bash - -# To re-enter from another terminal -# NAME=headerservice; docker exec -ti $NAME bash - -# To clean up -# docker rm $(docker ps -a -f status=exited -q) diff --git a/start_docker_service.sh b/start_docker_service.sh deleted file mode 100755 index c2dd3354..00000000 --- a/start_docker_service.sh +++ /dev/null @@ -1,26 +0,0 @@ -TAGNAME=5.1.1-9.0.0-salobj_6.3.4-hs_2.9.1 -DOCKER_IMA=lsstdm/atheaderservice:$TAGNAME -NAME=headerservice - -# Make sure we have it -docker pull $DOCKER_IMA - -# kill before launching -dockerID=$(docker ps -qa --filter name=$NAME) - -if [[ $dockerID> 0 ]]; then - echo "docker already running as $dockerID..." - docker rm -f $dockerID -fi - -echo "starting docker with image: $DOCKER_IMA" -docker run --network host --name $NAME -td $DOCKER_IMA - -# To clean up -# docker rm $(docker ps -a -f status=exited -q) - -# To re-enter from another terminal -# docker exec -ti $NAME bash - -# To attach to the process -# docker attach -$NAME diff --git a/start_docker_tss.sh b/start_docker_tss.sh deleted file mode 100755 index 06b1b978..00000000 --- a/start_docker_tss.sh +++ /dev/null @@ -1,22 +0,0 @@ -TAGNAME=c0039 -DOCKER_IMA=ts-dockerhub.lsst.org/headerservice:$TAGNAME -NAME=tssheaderservice -HSUSER=saluser - -hostname="`hostname -s`-docker" -ip=$(ifconfig en0 | grep inet | awk '$1=="inet" {print $2}') -xhost + $ip - - -echo "starting docker with image: $DOCKER_IMA" -docker run -ti \ - --entrypoint bash \ - -v $HOME/sal-home:/home/$HSUSER \ - --name $NAME \ - $DOCKER_IMA - -# To re-enter from another terminal -# NAME=tssheaderservice; docker exec -ti $NAME bash - -# To clean up -# docker rm $(docker ps -a -f status=exited -q)