diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1.parset b/Appl/CEP/CS1/CS1_Run/src/CS1.parset index 8c90c09d1b9744a8f0aa9a83073c4ce5281241d4..9d468cdebe3502c0328359029a5efc11f1b2b87d 100644 --- a/Appl/CEP/CS1/CS1_Run/src/CS1.parset +++ b/Appl/CEP/CS1/CS1_Run/src/CS1.parset @@ -13,14 +13,14 @@ OLAP.OLAP_Conn.BGLProc_Storage_Ports = [8300..8363] # should be one of NULL(inputFromMemory), FILE, TCP, UDP, ETHERNET -OLAP.OLAP_Conn.station_Input_Transport = UDP +OLAP.OLAP_Conn.station_Input_Transport = TCP -OLAP.OLAP_Conn.rawDataServers = ["10.181.0.4"] +OLAP.OLAP_Conn.rawDataServers = ["10.181.0.2"] OLAP.OLAP_Conn.rawDataPorts = [4000] # Variables for Storage OLAP.subbandsPerPset = 6 #6 -OLAP.psetsPerStorage = 2 #3 +OLAP.psetsPerStorage = 4 #3 OLAP.BGLProc.integrationSteps = 608 #768 at 200MHz OLAP.BGLProc.nrPPFTaps=16 OLAP.BGLProc.coresPerPset = 16 @@ -40,7 +40,7 @@ OLAP.DelayComp.nrCalcDelays = 16 OLAP.IPHeaderSize = 32 OLAP.EPAHeaderSize = 16 OLAP.nrTimesInFrame = 16 -OLAP.nrSubbandsPerFrame = 18 +OLAP.nrSubbandsPerFrame = 48 OLAP.nrBitsPerSample=16 OLAP.nrSecondsOfBuffer = 6 OLAP.maxNetworkDelay = 2.0 # 1 second extra added to compensate for timestamp bug @@ -77,8 +77,8 @@ Observation.Beam[8].angle2 = 0 Observation.nrBeams = 1 Observation.Beam[1].directionTypes = J2000 -Observation.Beam[1].subbandList = [57,73,89,121,138,154,170,187,203,219,236,252,268,285,301,317,334,350,366,383,399,415,432,448] -Observation.Beam[1].beamletList = [0..23] +Observation.Beam[1].subbandList = [280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327] +Observation.Beam[1].beamletList = [0..47] # example 2 beams: #Observation.nrBeams = 2 diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py index 69a1ca00405f83f7da720f77e6f33b7b1fc76a4a..b411bb2046f256e0e7550bebf8caa26adcce1e68 100755 --- a/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py +++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py @@ -35,8 +35,9 @@ def doObservation(obsID, parset): sys.exit(1) sectionTable = dict({\ - 'BGLProcSection': BGLProcSection(parset, userId.getHost(), options.partition), - 'StorageSection': StorageSection(parset, listfen) + 'InputSection': InputSection(parset, list003), + #'BGLProcSection': BGLProcSection(parset, userId.getHost(), options.partition), + #'StorageSection': StorageSection(parset, listfen) #Flagger(parset, listfen) }) diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Sections.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Sections.py index 99b324f709554242004e614f2c3780ef1c359c2c..d0b518ebf5b79e4ef3750b9b51c6aba9fd97624f 100644 --- a/Appl/CEP/CS1/CS1_Run/src/CS1_Sections.py +++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Sections.py @@ -142,6 +142,12 @@ class BGLProcSection(Section): raise Exception('illegal number of runs') Section.run(self, runlog, actualRuns, runCmd) +class InputSection(Section): + def __init__(self, parset, host): + Section.__init__(self, parset, \ + 'Appl/CEP/CS1/CS1_InputProc', \ + host = host, \ + buildvar = 'gnu_opt') class GeneratorSection(Section): def __init__(self, parset, host): Section.__init__(self, parset, \