Merge pull request #99 from lsst/tickets/RFC-940

Tickets/rfc 940
lsst · Aug 17, 2023 · f5f60b0 · f5f60b0
2 parents 82d629f + e4c5734
commit f5f60b0
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 129 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,8 +28,8 @@ jobs:
       - name: Python install
         run: |
           python -m pip install --upgrade pip
-          python -m pip install "lander<2.0.0"
           python -m pip install -r requirements.txt
+          python -m pip install "lander<2.0.0"
           python -m pip install -r milestones/requirements.txt
           make generated
 

diff --git a/DM Product Properties.csv b/DM Product Properties.csv
diff --git a/LDM-294.tex b/LDM-294.tex
@@ -23,6 +23,7 @@
 \addtohist{3.13}{2021-05-30}{Updated Org, inclusion of IT Chile, milestones refresh, USDF mention. Approved with RFC \jira{RFC-781}}{W.~O'Mullane}
 \addtohist{3.14}{2022-04-20}{Updated Pipelines and Calibration Scientist roles and org charts  following project reorganization. Added new T/CAM for the Data Facility. Gantt update \jira{DM-34498}}{L. Guy}
 \addtohist{3.15}{2022-09-11}{Update gantt, org chart, make some LSST Rubin, adjust system architecture \jira{RFC-877}}{W.~O'Mullane}
+\addtohist{3.16}{2023-08-13}{Update charts and schedule with June data \jira{RFC-940}}{W.~O'Mullane}
 }
 
 \title[DM PMP]{Data Management Organization and Management}

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ DOC=LDM-294
 SRC=$(DOC).tex
 all: $(DOC).pdf
 
-LDM-294.pdf: *.tex wbslist.tex ${GENERATED_FIGURES} aglossary.tex gantt.pdf 
+LDM-294.pdf: *.tex wbslist.tex ${GENERATED_FIGURES} aglossary.tex gantt.tex
 	xelatex $(DOC)
 	makeglossaries $(DOC)
 	bibtex $(DOC)

diff --git a/dmarc.tex b/dmarc.tex
@@ -8,12 +8,12 @@ \section{Data Management Conceptual Architecture \label{sect:dmarc}}
 
 \begin{itemize}
 \item The \gls{Commissioning} Cluster in the \gls{Base Facility} in La Serena, Chile
-\item The commissioning/construction compute facility at \gls{NCSA} in Urbana-Champaign
 \item The \gls{USDF} at \gls{SLAC} in Menlo Park
 \item The \gls{IDF} running on Google
 \item The \gls{US} \gls{DAC},  at \gls{SLAC} in Menlo Park
 \item The Chilean \gls{DAC} in the \gls{Base Facility}
 \item The \gls{FrDF} at \gls{CC-IN2P3} in Lyon, France
+\item The \gls{UKDF} at \gls{ROE} in Scotland
 \end{itemize}
 
 \figref{fig:dmsdeploy} shows the various \gls{DM} components which will be used in operations and the physical compute environments in which they will be deployed.
@@ -35,7 +35,6 @@ \section{Data Management Conceptual Architecture \label{sect:dmarc}}
 
 \begin{figure}[htbp]
 \begin{center}
-%\includegraphics[width=0.5\textwidth]{images/SciencePlatform}
 \includegraphics[width=0.9\textwidth]{images/fig-rubin-science-platform}
 \caption{The sub-components of the \gls{Science Platform}. \label{fig:sciplat}}
 \end{center}

diff --git a/dmwbs.tex b/dmwbs.tex
@@ -14,13 +14,11 @@ \subsection{Schedule}\label{sect:schedule}
 This is depicted in \figref{fig:schedule}.
 
 \begin{figure}[htbp]
-	\begin{center}
-		 \includegraphics[width=\textwidth]{gantt}
+	\hspace{-0.5cm}	 \includegraphics[width=1.1\textwidth]{gantt}
 		 \caption{DM major milestones---designated as LDM-503-\textit{x}---in
          the Rubin schedule. These milestones are defined at level 2 according
          to the scheme described in \secref{sect:plan}. Status in \citeds{DMTN-158}}
          \label{fig:schedule}
-	 \end{center}
  \end{figure}
 
 \subsection{Work breakdown structure}\label{sect:WBS}

diff --git a/gantt.pdf b/gantt.pdf
diff --git a/images b/images
diff --git a/milestones b/milestones
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
+pydantic<2.0.0
 treelib==1.5.1
 matplotlib
 pyyaml
-xlrd
+xlrd