Commit 08817bb4 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

debugging of nodata implementation

parent dbd3ef6f

Common/Servers/FitsWriter/src/DataCollection.cpp

+7 −3
Original line number Original line Diff line number Diff line
@@ -382,12 +382,17 @@ bool CDataCollection::setScanSetup(const Management::TScanSetup& setup,bool& rec 
bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,bool& recording,bool& inconsistent)

bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,bool& recording,bool& inconsistent)

{

{

	baci::ThreadSyncGuard guard(&m_mutex);

	baci::ThreadSyncGuard guard(&m_mutex);

	////*******************************************************

	IRA::CString outstr;

	IRA::CIRATools::timeToStr(setup.startUt,outstr);

	ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"SUBSCAN IS %ld",setup.subScanId));

	ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"REQUESTED_START_TIME WAS %s",(const char *)outstr));

	///////////// DEBUGGING ***************************************

	if (m_start && m_running) {

	if (m_start && m_running) {

		recording=true;

		recording=true;

		inconsistent=false;

		inconsistent=false;

		/////*****************************************

		/////*****************************************

		ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"RECORD_WHILE_RECORDING_REQUEST %d %d",m_start,m_running));

		ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"RECORD_WHILE_RECORDING_REQUEST %d %d",m_start,m_running));

		ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"REQUESTED_START_TIME WAS %lld",setup.startUt));

		///**************************** DEBUGGING, Inserted to track the Problem with roach and nodata

		///**************************** DEBUGGING, Inserted to track the Problem with roach and nodata

		return false;

		return false;

	}

	}
@@ -413,7 +418,6 @@ bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,boo 
			inconsistent=true;

			inconsistent=true;

			/////*****************************************

			/////*****************************************

			ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"INCONSISTENT_REQUEST %d %d %d %d",m_start,m_running,m_scanHeader,m_subScanHeader));

			ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"INCONSISTENT_REQUEST %d %d %d %d",m_start,m_running,m_scanHeader,m_subScanHeader));

			ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_WARNING,"REQUESTED_START_TIME WAS %lld",setup.startUt));

			///**************************** DEBUGGING, Inserted to track the Problem with roach and nodata

			///**************************** DEBUGGING, Inserted to track the Problem with roach and nodata

			return false;

			return false;

		}

		}

Common/Servers/FitsWriter/src/EngineThread.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ void CEngineThread::runLoop() 
	}

	}

	if (m_data->isStart() && m_data->isReady() &&  m_data->isScanHeaderReady() && m_data->isSubScanHeaderReady()) { // //main headers are already saved and file has to be opened

	if (m_data->isStart() && m_data->isReady() &&  m_data->isScanHeaderReady() && m_data->isSubScanHeaderReady()) { // //main headers are already saved and file has to be opened

		//*****************************************************************************************

		//*****************************************************************************************

		ACS_LOG(LM_FULL_INFO,"CEngineThread::runLoop()",(LM_NOTICE,"LET S BEGIN!"));

		ACS_LOG(LM_FULL_INFO,"CEngineThread::runLoop()",(LM_NOTICE,"LETS BEGIN SUBSCAN %ld!",m_data->getSubScanID()));

		//************************* ADDDED FOR DEBUGGING NoData/Roach Could be deleted ****************

		//************************* ADDDED FOR DEBUGGING NoData/Roach Could be deleted ****************

		if (!m_fileOpened) {

		if (!m_fileOpened) {

			m_data->setStatus(Management::MNG_OK);

			m_data->setStatus(Management::MNG_OK);