Commit 722ee8ff authored by Andrea Orlati's avatar Andrea Orlati
Browse files

Merge branch 'fix-issue-588' of https://github.com/discos/discos into fix-issue-588

parents 512c3591 00d1493c

Medicina/Configuration/CDB/alma/DataBlock/MinorServoParameters/MinorServoParameters.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
        <Xaxis>mm,-70.0,70.0,15,0,0,0,0</Xaxis>

        <Yaxis>mm,-70.0,70.0,-37.9928595,0.73212879,-0.00306993,0,0</Yaxis>

        <Zaxis>mm,-70.0,70.0,14.4818271,-0.33632055,0.03072849,0,0</Zaxis>

        <THETAXaxis>deg,-5,5.0,-0.015034618,0.000379257,-0.0000275544388609715,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,-0.048666344,-0.000499178,0.0000485976789168279,0,0</THETAYaxis>

        <THETAXaxis>deg,-5,5.0,-0.015034618,0.000379257,-0.000027554,0,0</THETAXaxis>

        <THETAYaxis>deg,-5,5.0,-0.048666344,-0.000499178,0.000048597,0,0</THETAYaxis>

    </MinorServo>

    <MinorServo>

        <code>CCC</code>

Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ throw (MinorServoErrors::SetupErrorExImpl) 
        THROW_EX(MinorServoErrors, SetupErrorEx, sce.what(), false);

    }catch(...){

        m_servo_status.starting = false;

        THROW_EX(MinorServoErrors, SetupErrorEx, "Cannot conclude setup", false);

        THROW_EX(MinorServoErrors, SetupErrorEx, "Cannot conclude setup >> "+boost::current_exception_diagnostic_information(), false);

    }

}