Commit 201ad7e8 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

fitswriter small adjustment in order to track down the roach bug

parent ec751594

Common/Servers/FitsWriter/src/DataCollection.cpp

+3 −3
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,boo 
		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,"REQUESTED_START_TIME WAS %ld",setup.startUt));

		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

		return false;

	}
@@ -412,8 +412,8 @@ bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,boo 
			recording=false;

			inconsistent=true;

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

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

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

			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

			return false;

		}

Common/Servers/FitsWriter/src/EngineThread.cpp

+7 −2
Original line number Diff line number Diff line
@@ -451,6 +451,9 @@ void CEngineThread::runLoop() 
		return;

	}

	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!"));

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

		if (!m_fileOpened) {

			m_data->setStatus(Management::MNG_OK);

			// create the file and save main headers
@@ -537,6 +540,8 @@ void CEngineThread::runLoop() 
#else

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

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

				m_fileOpened=true;

				m_data->startRunnigStage();

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

				//get data from receivers boss

				if (m_summaryOpened) {
@@ -873,8 +878,8 @@ void CEngineThread::runLoop() 
					}

				}				

#endif

				m_fileOpened=true;

				m_data->startRunnigStage();

				//m_fileOpened=true;

				//m_data->startRunnigStage();

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

				ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_NOTICE,"FILE_OPENED %s",(const char *)m_data->getFileName()));

			}