Skip to content

Fixes #291 #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scottwedge wants to merge 1 commit into
base: Labview2012
Choose a base branch
from
Open

Fixes #291 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions WVDNewArchitectureUpdate/WVD_Architecture_Update/NetCDFPython/MakeChildFilesV2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def processMCSData(FileName,NetCDFOutputPath,Header):
VarData ,VariableColumn ,VariableDescription,
VariableDimension,VariableName , VariableType , VariableUnit,MPDNum)
else: # Some error is reported
print('An error occured when reading the data file.')
print('An error occurred when reading the data file.')

#%%################################ MCS Data ##################################
def processMCSDataV2(FileName,NetCDFOutputPath,Header):
Expand Down Expand Up @@ -356,7 +356,7 @@ def processMCSDataV2(FileName,NetCDFOutputPath,Header):
VarData ,VariableColumn ,VariableDescription,
VariableDimension,VariableName , VariableType , VariableUnit,MPDNum)
else: # Some error is reported
print('An error occured when reading the data file.')
print('An error occurred when reading the data file.')

#%%################################ MCS Data ##################################
def processMCSScanDataV2(FileName,NetCDFOutputPath,Header):
Expand Down Expand Up @@ -397,7 +397,7 @@ def processMCSScanDataV2(FileName,NetCDFOutputPath,Header):
VarData ,VariableColumn ,VariableDescription,
VariableDimension,VariableName , VariableType , VariableUnit,MPDNum)
else: # Some error is reported
print('An error occured when reading the data file.')
print('An error occurred when reading the data file.')

#%%############################### MCS Power ##################################
def processMCSPower(FileName,NetCDFOutputPath,Header):
Expand Down Expand Up @@ -434,7 +434,7 @@ def processMCSPower(FileName,NetCDFOutputPath,Header):
VarData ,VariableColumn ,VariableDescription,
VariableDimension,VariableName , VariableType , VariableUnit,MPDNum)
else: # Some error is reported
print('An error occured when reading the data file.')
print('An error occurred when reading the data file.')

#%%############################### MCS Power ##################################
def processMCSPowerV2(FileName,NetCDFOutputPath,Header):
Expand Down Expand Up @@ -471,7 +471,7 @@ def processMCSPowerV2(FileName,NetCDFOutputPath,Header):
VarData ,VariableColumn ,VariableDescription,
VariableDimension,VariableName , VariableType , VariableUnit,MPDNum)
else: # Some error is reported
print('An error occured when reading the data file.')
print('An error occurred when reading the data file.')

#%%################################## UPS #####################################
def processUPS(FileName,NetCDFOutputPath,Header):
Expand Down Expand Up @@ -611,4 +611,4 @@ def makeNetCDF(ThenDate,ThenTime,NowDate,NowTime,LastTime,WarningFile,ErrorFile,
writeString = 'WARNING: Failure to process ' + FileType + ' data - ' + \
FileType + ' file = ' + str(File) + ' - ' + str(NowTime) + \
'\n' + str(sys.exc_info()[0]) + '\n\n'
print(writeString)
print(writeString)
4 changes: 2 additions & 2 deletions tempShare/WVDIAL_MCS_testScript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def openSocket():
global sock
try:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.setsockopt(socket.SOL_SOCKET,socket.SO_RCVBUF,RX_BUFF_LEN) # Set Rx buffer to accomodate pack of 12 histograms (144kB)
sock.setsockopt(socket.SOL_SOCKET,socket.SO_RCVBUF,RX_BUFF_LEN) # Set Rx buffer to accommodate pack of 12 histograms (144kB)
sock.settimeout(READBACK_TIMEOUT) # set timeout
printAndLog('Socket Rx Buffer: %s Bytes' % str(sock.getsockopt(socket.SOL_SOCKET,socket.SO_RCVBUF)))

Expand Down Expand Up @@ -1025,4 +1025,4 @@ def main():
return

if __name__ == '__main__':
main()
main()