Commit d2607ee6 authored by TheDebbio's avatar TheDebbio
Browse files

LO fixed conflict

parents 3146a29e 89915f99

.vscode/c_cpp_properties.json

0 → 100644
+21 −0
Original line number Diff line number Diff line 
{

    "configurations": [

        {

            "name": "Win32",

            "includePath": [

                "${workspaceFolder}/**",

                "${workspaceFolder}/Common/Libraries/IRALibrary/include"

            ],

            "defines": [

                "_DEBUG",

                "UNICODE",

                "_UNICODE"

            ],

            "windowsSdkVersion": "10.0.17763.0",

            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/cl.exe",

            "cStandard": "c11",

            "cppStandard": "c++03"

        }

    ],

    "version": 4

}
 
 No newline at end of file

.vscode/settings.json

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

    "files.associations": {

        "*.idl": "cpp",

        "ira": "cpp",

        "map": "cpp"

    }

}
 
 No newline at end of file

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NarrowBandwidthSetup/CCC/NormalModeSetup.xml→Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NarrowBandwidthSetup/CCC/NarrowBandwidthSetup.xml

100755 → 100644
+0 −0

File moved.File mode changed from 100755 to 100644.

View file

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NarrowBandwidthSetup/CHC/NormalModeSetup.xml→Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NarrowBandwidthSetup/CHC/NarrowBandwidthSetup.xml

100755 → 100644
+0 −0

File moved.File mode changed from 100755 to 100644.

View file

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NoiseMark/CCC/NoiseMark.xml

+5 −13
Original line number Diff line number Diff line
@@ -3,18 +3,10 @@ 
<NoiseMarkLookUpTable xmlns="urn:schemas-cosylab-com:NoiseMarkLookUpTable: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">

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

				

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>18.483</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>17.333</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>16.183</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>15.033</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>13.883</NoiseMark></MarkEntry>



<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>19.654</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>18.504</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>17.354</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>16.204</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>15.054</NoiseMark></MarkEntry>

				LCoeffs= "5.88"

				RCoeffs= "5.71"

				>



</NoiseMarkLookUpTable>
 
 No newline at end of file