Loading Common/Servers/ReceiversBoss/src/RecvBossCore.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -1666,7 +1666,7 @@ void CRecvBossCore::startScan(ACS::Time& startUT,const Receivers::TReceiversPara //********************************************************* // At the moment no scans are included in for receivers boss. so: // I comment out the controls and the error thrown if the receiver is not configured. // They should be resotred when the check (is_emptyscan=false) could be done. // They should be restored when the check (is_emptyscan=false) could be done. //********************************************************* if (m_currentRecvCode=="") { //_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::startScan()"); Loading Common/Servers/Scheduler/src/ScheduleExecutor.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -186,6 +186,8 @@ void CScheduleExecutor::runLoop() case SCAN_PREPARATION: { // command the scan to the telescope...in case of error the current scan is aborted //printf("SCAN_PREPARATION\n"); try { // clears all subsystem tracking flags m_core->clearTracking(); ACS_LOG(LM_FULL_INFO,"CScheduleExecutor::runLoop()",(LM_DEBUG,"COMMAND_SCAN_TO_THE_TELESCOPE")); primary=static_cast<Antenna::TTrackingParameters *>(m_currentScanRec.primaryParameters); secondary=static_cast<Antenna::TTrackingParameters *>(m_currentScanRec.secondaryParameters); Loading @@ -206,8 +208,6 @@ void CScheduleExecutor::runLoop() cleanScan(); break; } // clears all subsystem tracking flags m_core->clearTracking(); m_stage=WRITING_INITIALIZATION; } case WRITING_INITIALIZATION: { //prepare the data transfer, it configures the backend and the writer. In case of error the scan is aborted. Loading Common/Servers/XBackend/include/Common.h +9 −0 Original line number Diff line number Diff line Loading @@ -19,8 +19,17 @@ #define MAX_ADC_NUMBER 7 // CDB #endif #ifdef COMPILE_TARGET_MED #define DEFAULT_BINS 4096 #else #define DEFAULT_BINS 2048 #endif #define FLOW_NUMBER 1 #define MAX_GAIN 255 //Gain is in hardware units Loading Common/Servers/XBackend/src/Makefile +11 −0 Original line number Diff line number Diff line Loading @@ -17,6 +17,17 @@ # None #------------------------------------------------------------------------ # a quick comment on this: in order to control the Medicina version of the backend a small change of the code is required so I force the # definition of a symbol that can be used by the c++ precompiler. ifeq ($(TARGETSYS),MED) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED' else ifeq ($(TARGETSYS),NT) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_MED' -D 'COMPILE_TARGET_NT' else USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD' endif MAKE_PDF = ON # Loading Medicina/Configuration/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml 0 → 100644 +17 −0 Original line number Diff line number Diff line <?xml version='1.0' encoding='ISO-8859-1'?> <!-- - History: - --> <Component xmlns="urn:schemas-cosylab-com:Component:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="XBackends" Code="XBackendsImpl" Type="IDL:alma/Backends/XBackends:1.0" Container="XContainer" ImplLang="cpp" /> <!--"BackendsContainer"--> Loading
Common/Servers/ReceiversBoss/src/RecvBossCore.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -1666,7 +1666,7 @@ void CRecvBossCore::startScan(ACS::Time& startUT,const Receivers::TReceiversPara //********************************************************* // At the moment no scans are included in for receivers boss. so: // I comment out the controls and the error thrown if the receiver is not configured. // They should be resotred when the check (is_emptyscan=false) could be done. // They should be restored when the check (is_emptyscan=false) could be done. //********************************************************* if (m_currentRecvCode=="") { //_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::startScan()"); Loading
Common/Servers/Scheduler/src/ScheduleExecutor.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -186,6 +186,8 @@ void CScheduleExecutor::runLoop() case SCAN_PREPARATION: { // command the scan to the telescope...in case of error the current scan is aborted //printf("SCAN_PREPARATION\n"); try { // clears all subsystem tracking flags m_core->clearTracking(); ACS_LOG(LM_FULL_INFO,"CScheduleExecutor::runLoop()",(LM_DEBUG,"COMMAND_SCAN_TO_THE_TELESCOPE")); primary=static_cast<Antenna::TTrackingParameters *>(m_currentScanRec.primaryParameters); secondary=static_cast<Antenna::TTrackingParameters *>(m_currentScanRec.secondaryParameters); Loading @@ -206,8 +208,6 @@ void CScheduleExecutor::runLoop() cleanScan(); break; } // clears all subsystem tracking flags m_core->clearTracking(); m_stage=WRITING_INITIALIZATION; } case WRITING_INITIALIZATION: { //prepare the data transfer, it configures the backend and the writer. In case of error the scan is aborted. Loading
Common/Servers/XBackend/include/Common.h +9 −0 Original line number Diff line number Diff line Loading @@ -19,8 +19,17 @@ #define MAX_ADC_NUMBER 7 // CDB #endif #ifdef COMPILE_TARGET_MED #define DEFAULT_BINS 4096 #else #define DEFAULT_BINS 2048 #endif #define FLOW_NUMBER 1 #define MAX_GAIN 255 //Gain is in hardware units Loading
Common/Servers/XBackend/src/Makefile +11 −0 Original line number Diff line number Diff line Loading @@ -17,6 +17,17 @@ # None #------------------------------------------------------------------------ # a quick comment on this: in order to control the Medicina version of the backend a small change of the code is required so I force the # definition of a symbol that can be used by the c++ precompiler. ifeq ($(TARGETSYS),MED) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED' else ifeq ($(TARGETSYS),NT) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_MED' -D 'COMPILE_TARGET_NT' else USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD' endif MAKE_PDF = ON # Loading
Medicina/Configuration/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml 0 → 100644 +17 −0 Original line number Diff line number Diff line <?xml version='1.0' encoding='ISO-8859-1'?> <!-- - History: - --> <Component xmlns="urn:schemas-cosylab-com:Component:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="XBackends" Code="XBackendsImpl" Type="IDL:alma/Backends/XBackends:1.0" Container="XContainer" ImplLang="cpp" /> <!--"BackendsContainer"-->