Commit 22ef6ebe authored by Andrea Orlat's avatar Andrea Orlat
Browse files

fixed some bug in summary.fits file creation by FitsZilla

parent 2260f8f0

Common/Servers/FitsWriter/include/DataCollection.h

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ public: 


	bool isWriteSummary() const { return m_writeSummary; }



	void closeSummary() { m_writeSummary=false; }



	/**

	 * It puts the component into the stop stage

	 */

Common/Servers/FitsWriter/include/SummarySchema.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define SCHEMA_ENTRY26 ( _FILE_DOUBLE_TYPE,_FILE_MULTI_ENTRY,"BWID","bandwidth of the Nth section (MHz)" )

#define SCHEMA_ENTRY27 ( _FILE_LONG_TYPE,_FILE_MULTI_ENTRY,"CHAN","Number of spectral bins of the Nth section" )



#define SCHEMA_ENTRY28 ( _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VRAD","Radial velocity" )

#define SCHEMA_ENTRY28 ( _FILE_DOUBLE_TYPE,_FILE_SINGLE_ENTRY,"VRAD","Radial velocity" )

#define SCHEMA_ENTRY29 ( _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VFRAME","Radial velocity reference frame" )

#define SCHEMA_ENTRY30 ( _FILE_STRING_TYPE,_FILE_SINGLE_ENTRY,"VDEF","Radial velocity definition" )

Common/Servers/FitsWriter/src/DataCollection.cpp

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ void CDataCollection::haltStopStage() 
	baci::ThreadSyncGuard guard(&m_mutex);

	m_running=false;

	m_stop=false;

	m_writeSummary=false;

}



void CDataCollection::haltResetStage()

Common/Servers/FitsWriter/src/EngineThread.cpp

+27 −8
Original line number Diff line number Diff line
@@ -393,6 +393,20 @@ void CEngineThread::runLoop() 
	IRA::CString filePath,fileName;

	//CSecAreaResourceWrapper<CDataCollection> data=m_dataWrapper->Get();

	IRA::CIRATools::getTime(now); // it marks the start of the activity job

	if (m_summaryOpened && m_data->isWriteSummary()) {

		if ((!m_summary->write()) || (!m_summary->close())) {

			_EXCPT(ManagementErrors::FitsCreationErrorExImpl,impl,"CEngineThread::runLoop()");

			impl.setFileName((const char *)m_data->getSummaryFileName());

			impl.setError((const char *)m_summary->getLastError());

			impl.log(LM_ERROR); 

			m_data->setStatus(Management::MNG_FAILURE);

		}

		delete m_summary;

		m_summary=NULL;

		m_summaryOpened=false;

		m_data->closeSummary();

		ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_NOTICE,"SUMMARY_FILE_FINALIZED"));

	}

	if (m_data->isReset()) {

		if (m_fileOpened) {

			#ifdef FW_DEBUG
@@ -445,8 +459,9 @@ void CEngineThread::runLoop() 
			if (!m_summaryOpened) {

				// now let's create the summary file.

				m_summary=new CSummaryWriter();

				m_file->setBasePath("");

				m_file->setFileName((const char *)m_data->getSummaryFileName());

				m_summary->setBasePath("");

				m_summary->setFileName((const char *)m_data->getSummaryFileName());

				ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_DEBUG,"SUMMARY_FILE %s",(const char*)m_data->getSummaryFileName()));

				if (!m_summary->create()) {

					_EXCPT(ManagementErrors::FitsCreationErrorExImpl,impl,"CEngineThread::runLoop()");

					impl.setFileName((const char *)m_data->getSummaryFileName());
@@ -455,6 +470,7 @@ void CEngineThread::runLoop() 
					m_data->setStatus(Management::MNG_FAILURE);

				}

				m_summaryOpened=true;

				ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_DEBUG,"SUMMARY_OPENED"));

			}



			m_file = new CFitsWriter();
@@ -827,16 +843,19 @@ void CEngineThread::runLoop() 
		}

		m_fileOpened=false;

		ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_NOTICE,"FILE_FINALIZED"));

		if (m_summaryOpened && m_data->isWriteSummary()) {

			if (!m_summary->write()) {

			}

			if (!m_summary->close()) {

		/*if (m_summaryOpened && m_data->isWriteSummary()) {

			if ((!m_summary->write()) || (!m_summary->close())) {

					_EXCPT(ManagementErrors::FitsCreationErrorExImpl,impl,"CEngineThread::runLoop()");

					impl.setFileName((const char *)m_data->getSummaryFileName());

					impl.setError((const char *)m_summary->getLastError());

					impl.log(LM_ERROR); 

					m_data->setStatus(Management::MNG_FAILURE);

			}

			delete m_summary;

			m_summary=NULL;

			m_summaryOpened=false;

			ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_NOTICE,"SUMMARY_FILE_FINALIZED"));

		}

		}*/

		m_data->haltStopStage();

	}

	else if (m_data->isRunning()) { // file was already created.... then saves the data into it
@@ -1074,7 +1093,7 @@ void CEngineThread::collectAntennaData(FitsWriter_private::CFile* summaryFile) 
			summaryFile->setKeyword("OBJECT",sourceName);

			summaryFile->setKeyword("RightAscension",ra);

			summaryFile->setKeyword("Declination",dec);

			summaryFile->setKeyword("VRAD",sourceName);

			summaryFile->setKeyword("VRAD",vrad);

		}

		try { //get the estimated source fluxes

			ACS::doubleSeq_var fluxes;