Updating Galileo Quicksync acquisition with new configuration

conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf

@@ -17,7 +17,7 @@ ControlThread.wait_for_flowgraph=false
 SignalSource.implementation=File_Signal_Source
 
 ;#filename: path to file with the captured GNSS signal samples to be processed
-SignalSource.filename=/home/dmiralles2009/Downloads/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
+SignalSource.filename=../../../Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
 
 
 ;#item_type: Type and resolution for each of the signal samples. 
@@ -184,16 +184,18 @@ Resampler.sample_freq_out=4000000
 
 ;######### CHANNELS GLOBAL CONFIG ############
 ;#count: Number of available satellite channels.
-Channels.count=4
+Channels_Galileo.count=4
+Channels_GPS.count=0
 ;#in_acquisition: Number of channels simultaneously acquiring
 Channels.in_acquisition=1
 
 ;######### CHANNEL 0 CONFIG ############
 ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
 ;#if the option is disabled by default is assigned GPS
-Channel.system = Galileo
+Channel.system=Galileo
-;Channel.system = GPS
 
+;#if the option is disabled by default is assigned "1C" GPS L1 C/A
+Channel.signal=1B
 
 ;#signal: 
 ;# "1C" GPS L1 C/A
@@ -254,127 +256,71 @@ Channel.system = Galileo
 ;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 
 
-;#satellite: Satellite PRN ID for this channel. Disable this option to random search
 
-;######### CHANNEL 0 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Channel0.system=Galileo
-Channel0.signal=1B
-Channel0.satellite=20
-;Channel0.repeat_satellite=true
-
-
-;######### CHANNEL 1 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Channel1.system=Galileo
-Channel1.signal=1B
-Channel1.satellite=12
-;Channel1.repeat_satellite=true
-
-;######### CHANNEL 2 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Channel2.system=Galileo
-Channel2.signal=1B
-Channel2.satellite=19
-;Channel2.repeat_satellite=true
-
-;######### CHANNEL 3 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Channel3.system=Galileo
-Channel3.signal=1B
-Channel3.satellite=11
-;Channel3.repeat_satellite=true
 
 ;######### ACQUISITION GLOBAL CONFIG ############
-
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
-Acquisition.dump=true
+Acquisition_Galileo.dump=false
 ;#filename: Log path and filename
-Acquisition.dump_filename=./acq_dump.dat
+Acquisition_Galileo.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition.item_type=gr_complex
+Acquisition_Galileo.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz] 
-Acquisition.if=0
+Acquisition_Galileo.if=0
+;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
+Acquisition_Galileo.coherent_integration_time_ms=4
+
+Acquisition_Galileo.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
+
+;#threshold: Acquisition threshold
+Acquisition_Galileo.threshold=0.05
+;#doppler_max: Maximum expected Doppler shift [Hz]
+Acquisition_Galileo.doppler_max=15000
+;#doppler_max: Doppler step in the grid search [Hz]
+Acquisition_Galileo.doppler_step=125
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms];
-Acquisition.coherent_integration_time_ms=8
+Acquisition_Galileo.coherent_integration_time_ms=8
-Acquisition.repeat_satellite=true
-;######### ACQUISITION CHANNELS CONFIG ######
 
-;######### ACQUISITION CONFIG PARAMETERS ############
+Acquisition_Galileo.cboc=false
-
-;######### ACQUISITION CH 0 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Acquisition0.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
-Acquisition0.doppler_step=125
-Acquisition0.threshold=0.05
-Acquisition0.doppler_max=10000
-Acquisition0.repeat_satellite=true
-
-;######### ACQUISITION CH 1 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Acquisition1.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
-Acquisition1.doppler_step=125
-Acquisition1.threshold=0.05
-Acquisition1.doppler_max=15000
-Acquisition1.repeat_satellite=true
-
-;######### ACQUISITION CH 2 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Acquisition2.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
-Acquisition2.threshold=0.04
-Acquisition2.doppler_max=10000
-Acquisition2.doppler_step=125
-Acquisition2.repeat_satellite=true
-
-;######### ACQUISITION CH 3 CONFIG ############
-;### Uncoment these lines for Galileo Systems
-Acquisition3.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition
-Acquisition3.threshold=0.04
-Acquisition3.doppler_max=15000
-Acquisition3.doppler_step=62
-Acquisition3.repeat_satellite=true
-
-;######### ACQUISITION CH 1 CONFIG ############
-Acquisition.cboc=false
 
 ;######### TRACKING GLOBAL CONFIG ############
 
 ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
-Tracking.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
+Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
-Tracking.item_type=gr_complex
+Tracking_Galileo.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
-Tracking.if=0
+Tracking_Galileo.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
-Tracking.dump=true
+Tracking_Galileo.dump=true
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking.dump_filename=../data/veml_tracking_ch_
+Tracking_Galileo.dump_filename=../data/veml_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking.pll_bw_hz=20.0;
+Tracking_Galileo.pll_bw_hz=20.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking.dll_bw_hz=2.0;
+Tracking_Galileo.dll_bw_hz=2.0;
 
 ;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking.fll_bw_hz=10.0;
+Tracking_Galileo.fll_bw_hz=10.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking.order=3;
+Tracking_Galileo.order=3;
 
 ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
-Tracking.early_late_space_chips=0.15;
+Tracking_Galileo.early_late_space_chips=0.15;
 
 ;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
-Tracking.very_early_late_space_chips=0.6;
+Tracking_Galileo.very_early_late_space_chips=0.6;
 
 ;######### TELEMETRY DECODER CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A or [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
-TelemetryDecoder.implementation=Galileo_E1B_Telemetry_Decoder
+TelemetryDecoder_Galileo.implementation=Galileo_E1B_Telemetry_Decoder
-TelemetryDecoder.dump=false
+TelemetryDecoder_Galileo.dump=false
 
 ;######### OBSERVABLES CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.