From 6322d4f3961bc4b275707366d9bb2703ab98be79 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sat, 4 Jul 2020 21:48:10 +0100
Subject: Better names and comments in INPUTS.conf

Until now, the dataset's configuration names had a 'WFPC2' prefix. But this
very alien to anyone that is not familiar with the history of the Hubble
Space Telescope (the camera is no longer used! Its just used here since its
one of the standard FITS files from the FITS standard webpage).

With this commit the variable names have been modified to be more readable
and clear (having a 'DEMO-' prefix). Also the comments of 'INPUTS.conf'
(describing the purpose of each variable) were edited and made more clear.
---
 reproduce/analysis/make/delete-me.mk | 12 ++++++------
 reproduce/analysis/make/download.mk  |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'reproduce/analysis/make')

diff --git a/reproduce/analysis/make/delete-me.mk b/reproduce/analysis/make/delete-me.mk
index f45f9ea..bc94bf1 100644
--- a/reproduce/analysis/make/delete-me.mk
+++ b/reproduce/analysis/make/delete-me.mk
@@ -61,8 +61,8 @@ $(dm-squared): $(pconfdir)/delete-me-squared-num.conf | $(tex-publish-dir)
 
 
 
-# WFPC2 image PDF
-# -----------------
+# Demo image PDF
+# --------------
 #
 # For an example image, we'll make a PDF copy of the WFPC II image to
 # display in the paper.
@@ -82,8 +82,8 @@ $(dm-img-pdf): $(dm-histdir)/%.pdf: $(indir)/%.fits | $(dm-histdir)
 
 
 
-# Histogram of WFPC2 image
-# ------------------------
+# Histogram of demo image
+# -----------------------
 #
 # For an example plot, we'll show the pixel value histogram also. IMPORTANT
 # NOTE: because this histogram contains data that is included in a plot, we
@@ -103,7 +103,7 @@ $(dm-img-histogram): $(tex-publish-dir)/%-histogram.txt: $(indir)/%.fits \
         # metadata from '$@.data', and add copyright.
 	echo "# Histogram of example image to demonstrate Maneage (MANaging data linEAGE)." \
 	     > $@.tmp
-	echo "# Example image URL: $(WFPC2URL)/$(WFPC2IMAGE)" >> $@.tmp
+	echo "# Example image URL: $(DEMO-URL)" >> $@.tmp
 	echo "# " >> $@.tmp
 	awk '/^# Column .:/' $@.data >> $@.tmp
 	echo "# " >> $@.tmp
@@ -162,7 +162,7 @@ $(mtexdir)/delete-me.tex: $(dm-squared) $(dm-img-pdf) $(dm-img-histogram) \
 	v=$$(echo "$$mm" | awk '{printf "%.3f", $$2}');
 	echo "\newcommand{\deletememax}{$$v}"             >> $@
 
-        # Write the statistics of the WFPC2 image as a macro.
+        # Write the statistics of the demo image as a macro.
 	mean=$$(awk     '{printf("%.2f", $$1)}' $(dm-img-stats))
 	echo "\newcommand{\deletemewfpctwomean}{$$mean}"          >> $@
 	median=$$(awk   '{printf("%.2f", $$2)}' $(dm-img-stats))
diff --git a/reproduce/analysis/make/download.mk b/reproduce/analysis/make/download.mk
index bc8b8ce..fb3f523 100644
--- a/reproduce/analysis/make/download.mk
+++ b/reproduce/analysis/make/download.mk
@@ -58,7 +58,7 @@ $(inputdatasets): $(indir)/%.fits: | $(indir) $(lockdir)
 
         # Set the necessary parameters for this input file.
 	if   [ $* = wfpc2 ]; then
-	  localname=$(WFPC2IMAGE); url=$(WFPC2URL); mdf=$(WFPC2MD5);
+	  localname=$(DEMO-DATA); url=$(DEMO-URL); mdf=$(DEMO-MD5);
 	else
 	echo; echo; echo "Not recognized input dataset: '$*.fits'."
 	echo; echo; exit 1
@@ -84,6 +84,7 @@ $(inputdatasets): $(indir)/%.fits: | $(indir) $(lockdir)
 	sum=$$(md5sum $$unchecked | awk '{print $$1}')
 	if [ $$sum = $$mdf ]; then
 	  mv $$unchecked $@
+	  echo "Integrity confirmed, using $@ in this project."
 	else
 	  echo; echo;
 	  echo "Wrong MD5 checksum for input file '$$localname':"
@@ -102,4 +103,4 @@ $(inputdatasets): $(indir)/%.fits: | $(indir) $(lockdir)
 # It is very important to mention the address where the data were
 # downloaded in the final report.
 $(mtexdir)/download.tex: $(pconfdir)/INPUTS.conf | $(mtexdir)
-	echo "\\newcommand{\\wfpctwourl}{$(WFPC2URL)}" > $@
+	echo "\\newcommand{\\wfpctwourl}{$(DEMO-URL)}" > $@
-- 
cgit v1.2.1