fixed a bug in noData FitsFile (13b7ee48) · Commits · INAF / DISCOS

Common/Servers/FitsWriter/src/DataCollection.cpp

+16 −2

Original line number	Diff line number	Diff line
		@@ -223,18 +223,32 @@ bool CDataCollection::getFakeDump(ACS::Time& time,bool& calOn,char *& memory,cha
		ACS::Time now;
		IRA::CIRATools::getTime(clock);
		now=clock.value().value;
		//IRA::CString outString;
		//IRA::CIRATools::timeToStr(now,outString);
		//cout << "current time " << (const char *) outString << endl;
		//IRA::CIRATools::timeToStr(m_startUTTime,outString);
		//cout << "start time " << (const char *) outString << endl;
		//IRA::CIRATools::timeToStr(m_stopUTTime,outString);
		//cout << "stop time " << (const char *) outString << endl;
		if (m_startUTTime==0) { // if the scan is not started yet...nothing to do...there is no data
		return false;
		}
		else if ((m_stopUTTime!=0) && (m_fakeUTTime>=m_stopUTTime)) { // if a stop has been issued and the fake time is greater than it...
		return false; // now more data available....
		}
		else if (m_startUTTime>=now) { // the scan is started....
		else if (m_startUTTime<now) { // the scan is started....
		if (m_fakeUTTime==0) { // if the fake time is zero, not yet generated at least once......
		m_fakeUTTime=m_startUTTime; //initialize and go ahead....
		}
		else {
		if (m_fakeUTTime+getIntegrationTime()*10000<now) {
		m_fakeUTTime+=getIntegrationTime()*10000; //integration time is in millisec...
		//IRA::CIRATools::timeToStr(m_fakeUTTime,outString);
		//cout << "fake time " << (const char *) outString << endl;
		}
		else {
		return false;
		}
		}
		}
		else {

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ bool CEngineThread::processData()
		IRA::CString outString;
		if (!m_data->getFakeDump(time,calOn,bufferCopy,buffer,tracking,buffSize)) return false;
		IRA::CIRATools::timeToStr(time,outString);
		cout << "generated time " << (const char *) outString << endl;
		}
		else {
		if (!m_data->getDump(time,calOn,bufferCopy,buffer,tracking,buffSize)) return false;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1239,7 +1239,7 @@ void CCommandLine::fillMainHeader(Backends::TMainHeader& bkd)
		bkd.integration=intTime;
		//bkd.integration=m_integration;
		bkd.sampleSize=m_sampleSize;
		bkd.noData=false;
		bkd.noData=true;
		}

		void CCommandLine::fillChannelHeader(Backends::TSectionHeader *chHr,const long& size)

+1 −1