Commit 6e1de8fa authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'master' of github.com:discos/discos into centos_7_compatibility

parents b5564e19 fb21eb19

Common/Servers/MFKBandBaseReceiver/src/MFKBandBaseCore.cpp

+19 −6
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ void CComponentCore::getCalibrationMark( 
    }



    double f1,f2;

    double integral;

    vector<double> integral_vect;

    double integral = 0;

    double mark=0;

    for (unsigned i=0;i<stdLen;i++) {

        if (m_polarization[ifs[i]]==(long)Receivers::RCV_LCP) {
@@ -636,9 +637,15 @@ void CComponentCore::getCalibrationMark( 
            f1=realFreq;

            f2=f1+realBw;

            f1/=1000.0; f2/=1000.0; //frequencies in giga Hertz

            integral=(leftMarkCoeffs[feeds[i]][0]/4)*(f2*f2*f2*f2-f1*f1*f1*f1)+(leftMarkCoeffs[feeds[i]][1]/3) * \

                     (f2*f2*f2-f1*f1*f1)+(leftMarkCoeffs[feeds[i]][2]/2)*(f2*f2-f1*f1)+leftMarkCoeffs[feeds[i]][3]*(f2-f1);               

				for (vector<double>::size_type j=0; j<leftMarkCoeffs[feeds[i]].size(); j++){ //integrate

					int degree = ((leftMarkCoeffs[feeds[i]].size()) - j); //degree of the polynomial inside the integral

					integral_vect.push_back((leftMarkCoeffs[feeds[i]][j]/degree)*(pow(f2, degree) - pow(f1, degree)));

					}

            for(vector<double>::iterator it = integral_vect.begin(); it != integral_vect.end(); it++)

               integral += *it;

            mark=integral/(f2-f1);

            integral_vect.clear();

            integral = 0;

        }

        else if (m_polarization[ifs[i]]==(long)Receivers::RCV_RCP) {

            // take the real observed bandwidth....the correlation between detectro device and the band provided by the receiver
@@ -651,9 +658,15 @@ void CComponentCore::getCalibrationMark( 
            f1= realFreq;

            f2=f1+realBw;

            f1/=1000.0; f2/=1000.0; //frequencies in giga Hertz

            integral=(rightMarkCoeffs[feeds[i]][0]/4)*(f2*f2*f2*f2-f1*f1*f1*f1)+(rightMarkCoeffs[feeds[i]][1]/3) * \

                     (f2*f2*f2-f1*f1*f1)+(rightMarkCoeffs[feeds[i]][2]/2)*(f2*f2-f1*f1)+rightMarkCoeffs[feeds[i]][3]*(f2-f1);             

				for (vector<double>::size_type j=0; j<rightMarkCoeffs[feeds[i]].size(); j++){ //integrate

					int degree = ((rightMarkCoeffs[feeds[i]].size()) - j); //degree of the polynomial inside the integral

					integral_vect.push_back((rightMarkCoeffs[feeds[i]][j]/degree)*(pow(f2, degree) - pow(f1, degree)));

					}

            for(vector<double>::iterator it = integral_vect.begin(); it != integral_vect.end(); it++)

               integral += *it;

            mark=integral/(f2-f1);

            integral_vect.clear();

            integral = 0;

        }

        result[i]=mark;

        resFreq[i]=realFreq;

Medicina/CDB/alma/DataBlock/KBandDualFReceiver/MarkCoefficients/MarkCoefficients.xml

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

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



                <MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><Coefficients>0.35539,-25.57141,603.90321,-4656.81229</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><Coefficients>0.36656,-26.16018,613.14727,-4697.37959</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><Coefficients>0.18548,-14.13379,349.77806,-2795.54717</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><Coefficients>0.32624,-23.20331,542.14083,-4141.29465</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><Coefficients>-0.002043493,0.2691379,-14.67779,424.5092,-6873.623,59156.21,-211726.7</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><Coefficients>-0.001613087,0.2081852,-11.10797,313.8077,-4955.943,41554.51,-144823.5</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><Coefficients>-0.001590069,0.2223032,-12.87727,395.8157,-6813.837,62339.11,-236985.5 </Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><Coefficients>0.002984398,-0.4071563,23.03512,-691.3777,11603.30,-103172.9,379469.3</Coefficients></MarkEntry>



</MarkCoefficientsKBandLookUpTable>

Medicina/CDB/alma/RECEIVERS/KBandDualFReceiver/KBandDualFReceiver.xml

+12 −8
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

    actionThreadStackSize="2048"

    monitoringThreadStackSize="4096"

    DewarIPAddress="192.167.189.2"

    DewarPort="10000"

    LNAIPAddress="192.167.189.2"

    LNAPort="10001"   

    VertexIPAddress="192.168.51.2"

     DewarIPAddress="127.0.0.1"

    DewarPort="12902"

    LNAIPAddress="127.0.0.1"

    LNAPort="12903"   

    VertexIPAddress="127.0.0.1"

    VertexPort="2096"

    VertexCommand="proc kkc"    

    WatchDogResponseTime="10000000"
@@ -101,6 +101,7 @@ 
          units="Volts"

          format="%5.2f"

    />

    <!--

    <vdL2 description="drain voltage for the LNA left channel, stage 2"

          alarm_high_on="1.40"

          alarm_low_on="1.00"
@@ -236,6 +237,7 @@ 
          units="Volts"

          format="%5.2f"

    />

    -->



    <idL1 description="drain current for the LNA left channel, stage 1"

          alarm_high_on="2.83"
@@ -270,7 +272,7 @@ 
          units="Volts"

          format="%5.2f"

    />



    <!--

    <idL2 description="drain current for the LNA left channel, stage 2"

          alarm_high_on="3.0"

          alarm_low_on="2.3"
@@ -406,6 +408,7 @@ 
          units="Volts"

          format="%5.2f"

    />

    -->



    <vgL1 description="gate voltage for the LNA left channel, stage 1"

          alarm_high_on="0.1"
@@ -440,7 +443,7 @@ 
          units="Volts"

          format="%5.2f"

    />



    <!--

    <vgL2 description="gate voltage for the LNA left channel, stage 2"

          alarm_high_on="0.05"

          alarm_low_on="-0.2"
@@ -574,6 +577,7 @@ 
          units="Volts"

          format="%5.2f"

    />

	-->

   

    <cryoTemperatureCoolHead description="Cryogenic temperature measured near the cool head"

          alarm_high_on="10.0"

Medicina/Configuration/CDB/alma/DataBlock/KBandDualFReceiver/MarkCoefficients/MarkCoefficients.xml

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

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



                <MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><Coefficients>0.35539,-25.57141,603.90321,-4656.81229</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><Coefficients>0.36656,-26.16018,613.14727,-4697.37959</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><Coefficients>0.18548,-14.13379,349.77806,-2795.54717</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><Coefficients>0.32624,-23.20331,542.14083,-4141.29465</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><Coefficients>-0.002043493,0.2691379,-14.67779,424.5092,-6873.623,59156.21,-211726.7</Coefficients></MarkEntry>

                <MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><Coefficients>-0.001613087,0.2081852,-11.10797,313.8077,-4955.943,41554.51,-144823.5</Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><Coefficients>-0.001590069,0.2223032,-12.87727,395.8157,-6813.837,62339.11,-236985.5 </Coefficients></MarkEntry>

                <MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><Coefficients>0.002984398,-0.4071563,23.03512,-691.3777,11603.30,-103172.9,379469.3</Coefficients></MarkEntry>



</MarkCoefficientsKBandLookUpTable>

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

+1 −5
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ 
        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

</Receiver>



<!--

   KKC model modified in order to use secondary feed as primary. 

   Original: <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1411607116 </coefficientVal06>

-->



<Receiver>

	<receiverCode>KKC</receiverCode>
@@ -91,7 +87,7 @@ 
        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0199117530 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0069123046 </coefficientVal04>     

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0001305724 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0411607116 </coefficientVal06>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.1411607116 </coefficientVal06>        

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0013927888 </coefficientVal07>

        <coefficientNum08> 1 </coefficientNum08> <coefficientVal08> 0.0038510617 </coefficientVal08>                

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0 </coefficientVal09>