Commit 13f14c62 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

fix issue #505: data ownership cluse by INAF added to fits headers. (#519)

parent 5c9f50ec

CHANGELOG.md

+6 −0
Original line number Diff line number Diff line
@@ -81,3 +81,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
### Fixed

    issue #433 - limited refraction correction values to a meaningful range in order to avoid flooding the jlog with warning messages whenever the elevation is close to 90 degrees

    issue #502 - removed last service daemon reference from Manager.xml io SRT production line

    

## [discos1.0.5] - 

## Added

	issue #504 - added credits clause (regarding INAF data ownership) to fits files headers

## Fixed

## Changed

Common/Servers/FitsWriter/include/Version.h

+22 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define FITS_VERSION10 "V.1.12"

#define FITS_VERSION11 "V.1.2"



#define CURRENT_VERSION FITS_VERSION10

#define CURRENT_VERSION FITS_VERSION11



#define DEFAULT_COMMENT CURRENT_VERSION" Created by  S. Righini, M. Bartolini  & A. Orlati"
@@ -38,4 +38,25 @@ 
#define HISTORY10 FITS_VERSION10" Summary.fits has now a number of meaningful keywords"

#define HISTORY11 FITS_VERSION11" Frequency and bandwidth columns added to Section table reporting backend sampled band"



#define CREDITS1  " "

#define CREDITS2  "These data are property of:"

#define CREDITS3  " "

#define CREDITS4  "Istituto Nazionale di Astrofisica-INAF"

#define CREDITS5  "National Institute for Astrophysics-INAF"

#define CREDITS6  "via del Parco Mellini 84"

#define CREDITS7  "00136 Roma (ITALY)"

#define CREDITS8  " "

#define CREDITS9  "Permission is granted for publication and reproduction of this"

#define CREDITS10 "material for scholarly, educational, and private non-commercial"

#define CREDITS11 "use. Inquiries for potential commercial uses should be sent to"

#define CREDITS12 "the address above."

#define CREDITS13 " "

#define CREDITS14 "--------------------------------------------------------------"

#define CREDITS15 " "

#define CREDITS16 "These data can be retrieved from the site"

#define CREDITS17 "http://............"

#define CREDITS18 "under the usage rules reported at that site."







#endif /* VERSION_H_ */

Common/Servers/FitsWriter/src/FitsWriter.cpp

+20 −1
Original line number Diff line number Diff line
@@ -233,6 +233,25 @@ bool CFitsWriter::create() 
	if (!CFitsTools::primaryHeaderHistory(pFits,HISTORY9,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderHistory(pFits,HISTORY10,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderHistory(pFits,HISTORY11,m_lastError)) return false;

	

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS1,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS2,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS3,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS4,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS5,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS6,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS7,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS8,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS9,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS10,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS11,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS12,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS13,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS14,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS15,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS16,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS17,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(pFits,CREDITS18,m_lastError)) return false;	

	return true;

};

Common/Servers/FitsWriter/src/SummaryWriter.cpp

+22 −0
Original line number Diff line number Diff line
@@ -60,6 +60,28 @@ bool CSummaryWriter::create() 
	if (!CFitsTools::primaryHeaderHistory(m_pFits,HISTORY8,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderHistory(m_pFits,HISTORY9,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderHistory(m_pFits,HISTORY10,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderHistory(m_pFits,HISTORY11,m_lastError)) return false;

	

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS1,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS2,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS3,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS4,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS5,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS6,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS7,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS8,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS9,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS10,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS11,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS12,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS13,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS14,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS15,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS16,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS17,m_lastError)) return false;

	if (!CFitsTools::primaryHeaderComment(m_pFits,CREDITS18,m_lastError)) return false;

	

	

	m_fitsWritten=false;

	return true;

};