Commit 22025c6b authored by Jason Wu's avatar Jason Wu
Browse files

Merge branch 'master' into 'production'

Master

See merge request !49
parents 79e1957f d42d72dd
......@@ -6,7 +6,7 @@
# provisioning systems. The default "latest" is set in the common role and
# overriden here for the production environment.
version_tag: "210914.0"
version_tag: "210915.0"
# These settings specify the repositories used to build the EDD
# In particular useful to be tweaked in a local custom mysite_dev inventory to develop the provisioning system.
......
......@@ -42,11 +42,11 @@
"id": "gated_stokes_spectrometer",
"input_data_streams": {
"polarization_0": {
"source": "dig_pack_controller:polarization_0",
"source": "dig_pack_controller_1:polarization_0",
"format": "MPIFR_EDD_Packetizer:1"
},
"polarization_1": {
"source": "dig_pack_controller:polarization_1",
"source": "dig_pack_controller_1:polarization_1",
"format": "MPIFR_EDD_Packetizer:1"
}
},
......
......@@ -4,17 +4,18 @@
"id": "dig_pack_controller",
"bit_depth": 8,
"sampling_rate": 4000000000.0,
"predecimation_factor": 4,
"flip_spectrum": true,
"force_reconfigure": 1,
"predecimation_factor": 1,
"flip_spectrum": false,
"output_data_streams": {
"polarization_0": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "225.0.0.110+3",
"ip": "225.0.0.160+3",
"port": "7148"
},
"polarization_1": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "225.0.0.114+3",
"ip": "225.0.0.164+3",
"port": "7148"
}
}
......@@ -114,70 +115,194 @@
]
},
{
"id": "pulsar_timing1",
"zaplist": "4600:4601",
"input_data_streams": [
{
"id": "skarab_pfb_controller",
"input_data_streams": {
"polarization_0": {
"source": "dig_pack_controller:polarization_0"
},
{
"polarization_1": {
"source": "dig_pack_controller:polarization_1"
}
],
"dada_header_params": {
"bandwidth": 500,
"frequency_mhz": 4750.0,
"tsamp": 0.001
},
"force_program": true,
"firmware": "s_2g8b_64ch_coddhg_2021-01-06_1353.fpg",
"initial_quantization_factor": 1179648,
"initial_fft_shift": 127,
"channels_per_group": 1,
"output_data_streams": {
"band0": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.120+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1268.0
},
"band1": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.128+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1396.0
},
"band2": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.136+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1524.0
},
"band3": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.144+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1652.0
},
"band4": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.152+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1780.0
},
"band5": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.160+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 1908.0
},
"band6": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.168+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 2036.0
},
"band7": {
"format": "MPIFR_EDD_Packetizer:1",
"ip": "239.0.0.176+7",
"port": "60001",
"sample_rate": 4000000000.0,
"central_freq": 2164.0
}
}
},
{
"id": "pulsar_searching1",
"merge_threads": 1,
"active":0,
"npol": 1,
"mode": "Searching",
"zaplist": "4600:4601",
"id": "pulsar_timing1",
"npart": 32,
"merge_threads":6,
"merge_application": "edd_roach_merge_leap",
"input_data_streams": [
{
"source": "dig_pack_controller:polarization_0"
"source": "skarab_pfb_controller:band0",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "skarab_pfb_controller:band1",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "dig_pack_controller:polarization_1"
"source": "skarab_pfb_controller:band2",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "skarab_pfb_controller:band3",
"format": "MPIFR_EDD_Packetizer:1"
}
],
"dada_header_params": {
"bandwidth": 500,
"frequency_mhz": 4750.0,
"tsamp": 0.001
"filesize": 640000000,
"instrument": "SKARAB",
"receiver_name": "P217",
"mode": "PSR",
"nbit": 8,
"ndim": 2,
"npol": 2,
"nchan": 32,
"bandwidth": 1000,
"frequency_mhz": 4484.375,
"resolution": 1,
"tsamp": 0.032,
"dsb": 1,
"heaps_nbytes": 32000,
"nindices": 2,
"idx1_modulo": 64000,
"idx1_step": 1024000,
"idx2_item": 2,
"idx2_list": "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31",
"idx2_mask": "unset",
"slots_skip": 8,
"dada_nslots": 3
},
"dada": {
"size": 102400000,
"number": 32
},
"dadc": {
"size": 102400000,
"number": 32
}
},
{
"id": "pulsar_baseband1",
"mode": "Baseband",
"active":0,
{
"id": "pulsar_timing2",
"npart": 32,
"merge_threads":6,
"merge_application": "edd_roach_merge_leap",
"input_data_streams": [
{
"source": "dig_pack_controller:polarization_0"
"source": "skarab_pfb_controller:band4",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "dig_pack_controller:polarization_1"
{
"source": "skarab_pfb_controller:band5",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "skarab_pfb_controller:band6",
"format": "MPIFR_EDD_Packetizer:1"
},
{
"source": "skarab_pfb_controller:band7",
"format": "MPIFR_EDD_Packetizer:1"
}
],
"dada_header_params": {
"bandwidth": 500,
"frequency_mhz": 4750.0,
"tsamp": 0.001,
"slots_skip": 0,
"dada_nslots": 2
},
"dadc": {
"size": 6553600000,
"number": 3
"filesize": 640000000,
"instrument": "SKARAB",
"receiver_name": "P217",
"mode": "PSR",
"nbit": 8,
"ndim": 2,
"npol": 2,
"nchan": 32,
"bandwidth": 1000,
"frequency_mhz": 5484.375,
"resolution": 1,
"tsamp": 0.032,
"dsb": 1,
"heaps_nbytes": 32000,
"nindices": 2,
"idx1_modulo": 64000,
"idx1_step": 1024000,
"idx2_item": 2,
"idx2_list": "32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63",
"idx2_mask": "unset",
"slots_skip": 8,
"dada_nslots": 3
},
"dada": {
"size": 6553600000,
"number": 3
"size": 102400000,
"number": 32
},
"dadc": {
"size": 102400000,
"number": 32
}
}
]
}
}
\ No newline at end of file
......@@ -13,7 +13,6 @@
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/"
- role: gated_full_stokes_spectrometer
container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9702
- hosts: gpu_server[0]
vars:
......@@ -21,16 +20,15 @@
roles:
- role: dig_pack_controller
container_name: dig_pack_controller
device: packetizer-fr-01
- role: pulsar_pipeline
container_name: pulsar_baseband1
device: packetizer-sfk-01
- role: skarab_pfb_controller
container_name: skarab_pfb_controller
device: skarab_00
container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9703
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/baseband/"
- role: pulsar_pipeline
container_name: pulsar_searching1
container_env: "EDD_ALLOWED_NUMA_NODES=0"
edd_group: 9701
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/search/"
container_name: pulsar_timing2
container_env: "EDD_ALLOWED_NUMA_NODES=1"
edd_group: 9700
data_base_path: "/beegfsEDD/EDD_pipeline_data/production/pulsar/timing/"
- role: fits_interface
container_env: "EDD_ALLOWED_NUMA_NODES=0"
container_env: "EDD_ALLOWED_NUMA_NODES=0"
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment