Commit f6070e0e authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Updates for CLow and SRT Active Surface

parent 2b9fbb62

SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRT5GHzReceiver/SRT5GHzReceiver.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

              

	Name="5GHzReceiver"

	Code="SRT7GHzImpl"

	Code="SRT5GHzImpl"

	Type="IDL:alma/Receivers/SRT5GHz:1.0"

	Container="SRT5GHzContainer"

	KeepAliveTime="-1"

SRT/Configuration/CDB/alma/DataBlock/SRT5GHzReceiver/Synthesizer/Synthesizer.xml

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">



<SynthesizerEntry><Frequency>8200.0</Frequency><OutputPower>6</OutputPower></SynthesizerEntry>

<SynthesizerEntry><Frequency>8200.0</Frequency><OutputPower>16</OutputPower></SynthesizerEntry>



</LocalOscillatorLookUpTable>

SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h

+3 −3
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
#define lastUSD 1116

#define LOOPTIME 100000 // 0,10 sec

#define CDBPATH std::string(getenv("ACS_CDB")) + "/CDB/"

#define USDTABLE (CDBPATH + "alma/AS/tab_convUSD.txt").c_str()

#define USDTABLECORRECTIONS (CDBPATH + "alma/AS/act_rev02.txt").c_str()

#define USDTABLE CDBPATH + "alma/AS/tab_convUSD.txt"

#define USDTABLECORRECTIONS CDBPATH + "alma/AS/act_rev02.txt"

#define MM2HSTEP    350 //(10500 HSTEP / 30 MM)

#define MM2STEP     1400 //(42000 STEP / 30 MM)

#define WARNINGUSDPERCENT 0.95
@@ -228,7 +228,7 @@ private: 
    

    bool m_newlut;



    const char* m_lut;

    std::string m_lut;

};



#endif /*SRTACTIVESURFACEBOSSCORE_H_*/

SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp

+6 −8
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ void CSRTActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetComp 
    char * value2;



    //s_usdTable = getenv ("ACS_CDB");

    //strcat(s_usdTable,USDTABLE);

    value2 = USDTABLE;

    //strcat(s_usdTable,USDTABLE.c_str());

    value2 = USDTABLE.c_str();

    //ifstream usdTable(s_usdTable);

    ifstream usdTable(value2);

    if(!usdTable)
@@ -78,7 +78,7 @@ void CSRTActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetComp 
        exit(-1);

    }



    value = USDTABLECORRECTIONS;

    value = USDTABLECORRECTIONS.c_str();

    ifstream usdCorrections (value);

    if(!usdCorrections)

    {
@@ -1360,7 +1360,7 @@ void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::C 


void CSRTActiveSurfaceBossCore::asSetLUT(const char *newlut)

{

    m_lut= (CDBPATH + "alma/AS/" + newlut).c_str();

    m_lut = std::string(CDBPATH + "alma/AS/" + newlut);

    m_newlut = true;

}
@@ -1378,11 +1378,9 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP 
    if(all_sectors) // USD tables has not been loaded yet

    {

        ifstream usdCorrections(m_lut);

        //ifstream usdCorrections (USDTABLECORRECTIONS);

        if(!usdCorrections)

        {

            ACS_SHORT_LOG ((LM_INFO, "File %s not found", m_lut));

            //ACS_SHORT_LOG ((LM_INFO, "File %s not found", USDTABLECORRECTIONS));

            ACS_SHORT_LOG ((LM_INFO, "File %s not found", m_lut.c_str()));

            exit(-1);

        }

        actuatorsCorrections.length(NPOSITIONS);