User ECSV format to write model and detect files.

.github/workflows/docker-image.yml

@@ -0,0 +1,22 @@
+name: Publish to CANFAR
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and Push the SSIM Docker image
+      run:  |
+        docker build --target deploy --build-arg VERSION=python -t ssim:python -f Dockerfile .
+        docker login --username ${{ secrets.IMAGES_CANFAR_LOGIN}} --password ${{ IMAGES_CANFAR_TOKEN}}
+        docker push ssim:python
+    -

.gitignore

@@ -5,9 +5,19 @@ OSSOSv11/
 OSSOSv11.tgz
 .DS_Store
 *.log
-*.ipynb
+.ipynb_checkpoints
+*.swp
 ossssim.egg-info
 SurveySubsF95.py
 *.so
+*.o
+*.fpp
+*.mod
 *.icloud
 dist
+Rebound_Archive*.bin
+fortran/F95/bdir/
+.python-version
+uv.lock
+bdir
+.vscode

Dockerfile

@@ -1,60 +1,78 @@
 # this builds a container that can be used to run the SurveySimulator (python and fortran)
 # This container is loaded into the canfar Science Portal for use/execution.
 # Can also be used directly with docker.
-FROM ubuntu:latest as deploy
-USER root
-RUN apt-get update && yes | unminimize 
-RUN apt-get update && yes | apt-get install wget man man-db manpages-posix git \
-    build-essential zip unzip xdg-utils less emacs nano xterm vim rsync tree gfortran
+FROM condaforge/miniforge3:latest as base
+# FROM jupyter/scipy-notebook as base
+# USER root
+# ENV DEBIAN_FRONTEND="noninteractive"
+RUN apt -y -q update 
+RUN apt -y -q install curl wget man man-db git build-essential zip unzip xdg-utils less emacs nano xterm vim rsync tree gfortran
+RUN apt -y install python3-numpy
+RUN apt -y -q install meson ninja-build
+
 
 
 # SKAHA system settings and permissions
-RUN apt-get update && yes | apt-get install sssd libnss-sss libpam-sss
+RUN apt install -y -q sssd libnss-sss libpam-sss
 COPY etc/nofiles.conf /etc/security/limits.d/
 COPY etc/nsswitch.conf /etc/
 ## see https://bugzilla.redhat.com/show_bug.cgi?id=1773148
 RUN touch /etc/sudo.conf && echo "Set disable_coredump false" > /etc/sudo.conf
 # generate missing dbus uuid (issue #47)
 RUN dbus-uuidgen --ensure
 
+
 # setup this container for skaha launching
 COPY etc/startup.sh /skaha/startup.sh
 RUN chmod +x /skaha/startup.sh
 
 
 # setup a the needed python environment
-RUN apt-get update && yes | apt-get install python3 pip
-RUN pip3 install cadctap
-RUN pip3 install vos
-RUN pip3 install numpy
-RUN pip3 install scipy
-RUN pip3 install astropy
-RUN pip3 install --pre astroquery
-RUN pip3 install matplotlib
-RUN pip3 install f90wrap
-RUN pip3 install rebound
-RUN pip3 install jupyter
-RUN pip3 install jupyterlab
+# RUN apt-get update && yes | apt-get install python3.11 pip
+# RUN yes | apt install python3.12-venv
+# RUN python3 -m venv /opt/SSim/venv
+RUN pip install jupyter
+RUN pip install cadctap
+RUN pip install vos
+RUN pip install scipy
+RUN pip install astropy
+RUN pip install astroquery
+RUN pip install matplotlib
+RUN pip install f90wrap
+# RUN pip install git+https://github.com/jameskermode/f90wrap
+RUN pip install rebound
+RUN pip3 install astroplan
+RUN pip install Deprecated
+RUN pip install canfar
+
 
 # Build the SSim
-RUN mkdir /opt/SSim
-RUN mkdir /opt/SSim/fortran
-COPY fortran/F95 /opt/SSim/fortran/F95
+RUN mkdir -p /opt/SSim/fortran
+COPY fortran /opt/SSim/fortran
 COPY python /opt/SSim/python
 WORKDIR /opt/SSim/fortran/F95
+
+# install Fortran based binary of SSim
 RUN make clean && make Driver GIMEOBJ=ReadModelFromFile
 RUN cp Driver /usr/local/bin/SSim
-WORKDIR /opt/SSim/python
-RUN pip install .
+# RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections 
+# RUN apt-get install -y ttf-mscorefonts-installer
 
-RUN pip3 install astroplan
+# install the Python based version of SSim
+FROM base as deploy
+WORKDIR /opt/SSim/python
+# RUN pip install .
+# RUN python setup.py install
 
 # Two build sets, deploy and test
-FROM deploy as test
-RUN echo "Adding a test user to run local testing"
+FROM base as test
+
 RUN mkdir -p /arc/home
 RUN groupadd -g 1001 testuser
 RUN useradd -u 1001 -g 1001 -s /bin/bash -d /arc/home/testuser -m testuser
+RUN chown -R testuser /opt/SSim
+WORKDIR /opt/SSim/python
+# RUN pip3 install -e .
 USER testuser
 WORKDIR /arc/home/testuser
 COPY etc/ReadModelFromFile.in ./

Makefile

@@ -2,7 +2,7 @@
 REPO = images.canfar.net
 PROJECT = uvickbos
 DEVNAME = ssim
-VERSION = python
+VERSION = 3.0
 
 NAME = $(REPO)/$(PROJECT)/$(DEVNAME)
 
@@ -14,6 +14,7 @@ deploy: production
 
 dev: dependencies Dockerfile
 	docker build --target test --build-arg VERSION=$(VERSION) -t $(NAME):$(VERSION) -f Dockerfile .
+	echo "docker run --rm -it -p 8888:8888 $(NAME):$(VERSION) bash"
 
 dependencies: 
 

README.md

@@ -22,14 +22,11 @@ eupl1.1.-licence-en_0.pdf (detailed description of the licence).
 This source code is provided as is, with no warranty of any kind.  The user takes full responsiblity for any damage to system, and
 for any scientific conclusion drawn.
 
-
 ### Contact
 The primary contact for the Survey Simulator code is:  
 * Jean-Marc Petit: Jean-Marc.Petit@normalesup.org
 
-
 ### Acknowledgement
-
 
 Cite **Petit, J.-M., et al., AJ, Vol 142 ID 131 (2011)** if you make 
 use of the SurveySimulator, or the CFEPS L7SyntheticModel-v09 Kuiper belt model.
@@ -127,11 +124,85 @@ See Simulator/F95/fortran/example or Simulator/F77/fortan/example for examples o
 to compile (e.g. `make InnerHotModel`) a survey simulator.
 
 ### Simulator/
+
+#### Simulator/fortran/{F95|F77}/SurevySubs.f
+This contains the source code for the Survey Simulator.  in particular Detos1 which determines, based on
+the given orbit and the survey characterization area, which sources are detected.
+
+The Detos1 subrouting is described in the source code but reproduced here to make you aware of the inputs and outputs.
+
+```fortran
+
+subroutine Detos1 (o_m, jday, hx, color, gb, ph, period, amp, surnam, seed, &
+          debug, &
+       flag, ra, dec, d_ra, d_dec, r, delta, m_int, m_rand, eff, isur, mt, &
+       jdayp, ic, surna, h_rand, ierr)
+!-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
+! This routine determines if a given object is seen by the survey
+! described in the directory \verb|surnam|.
+! An object is described by its ecliptic (J2000) barycentric osculating
+! elements given at time \verb|jday|.
+! This version uses polygons to describe the footprint of the block on
+! the sky.
+!-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
+!
+! J.-M. Petit  Observatoire de Besancon
+! Version 1 : January 2006
+! Version 2 : May 2013
+! Version 3 : March 2016
+! Version 4 : May 2016
+!             Changed API to remove size of arrays, added parameter
+!             statement to define array sizes (in include file).
+!             Continue looping on pointings until object is detected,
+!             characterized and tracked. Don't stop at first detection.
+!
+!-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
+! INPUT
+!     o_m   : orbital elements of object (t_orb_m)
+!     jday  : Time of elements [JD] (R8)
+!     hx    : Absolute magnitude of object in 'x' band, what ever this is (R8)
+!     color : Array of colors (128*R8)
+!                IACHAR(FILTER)+1 : FILTER - X
+!     gb    : opposition surge factor G, Bowell formalism (R8)
+!     ph    : phase of lightcurve at epoch jday [rad] (R8)
+!     period: period of lightcurve [day] (R8)
+!     amp   : amplitude of lightcurve [mag] (R8)
+!     surnam: Survey directory name (CH)
+!
+! OUTPUT
+!     seed  : Random number generator seed (I4)
+!     flag  : Return flag (I4): 
+!                0: not found 
+!                1: found, but not tracked
+!                2: found and tracked
+!                3: characterized, but not tracked
+!                4: characterized and tracked
+!     ra    : Right ascension at detection [rad] (R8)
+!     dec   : Declination at detection [rad] (R8)
+!     d_ra  : Right ascension rate [rad/day] (R8)
+!     d_dec : Declination rate [rad/day] (R8)
+!     r     : Sun-object distance [AU] (R8)
+!     delta : Earth-object distance [AU] (R8)
+!     m_int : Intrinsic apparent magnitude, in x-band (R8)
+!     m_rand: Averaged randomized magnitude, in detection filter (R8)
+!     eff   : Actual efficiency of detection (R8)
+!     isur  : Identification number of survey the object was in (I4)
+!     mt    : Mean anomaly at discovery [rad] (R8)
+!     jdayp : Time of discovery [JD] (R8)
+!     ic    : Index of color used for survey (I4)
+!     surna : Detection survey name (CH10)
+!     h_rand: Absolute randomized magnitude, in detection filter (R8)
+!     ierr  : error flag
+!-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
+'''
+
+```
 #### Simulator/{F95|F77}/fortran/ReadModelFromFile.f 
 This contains the source code for a "GiMeObj" routine that reads 
 an (orbital+size+colour+lightcurve) model from a file (lookup table).
 Use `make ReadModelFromFile` to build a `Driver` program that can be used 
 to run simulation of observing the Kuiper belt model described in `ReadModelFromFile.f`. 
+
 #### Simulator/{F95|F77}/fortran/InnerHotModel.f 
 Contains the source code for a GiMeObj routine that generates
 objects according to some parametric prescription. 

fortran/pyproject.toml

@@ -0,0 +1,19 @@
+[build-system]
+requires = ["meson-python", "setuptools>=68", "wheel", "f90wrap"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "OSSSurveySimulatorLibrary"
+version = "1.0"
+description = "Outer Solar System Survey Simulation Library written in F95 and distributed as a Python module."
+readme = "README.md"
+requires-python = ">=3.12"
+authors = [
+    {name = "J.M. Petit", email = "jmpetit@obs-besacon.fr" },
+    {name = "J.J. Kavelaars", email = "jjkavelaars@gmail.com" }
+]
+license = "CC0-1.0"
+dependencies = []
+
+[project.urls]
+Homepage = "https://www.ossos-survey.org/simulator.html"