To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 41214867 authored by holukas's avatar holukas
Browse files

Octal as int

parent 2721f7d1
......@@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="254ecb79-655b-4854-8af6-177bb7347e8a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/bico/settings/_version.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/_version.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/ops/vis.py" beforeDir="false" afterPath="$PROJECT_DIR$/bico/ops/vis.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/settings/Bico.settings" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/Bico.settings" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bico/settings/Bico.settingsOld" beforeDir="false" afterPath="$PROJECT_DIR$/bico/settings/Bico.settingsOld" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -285,6 +287,7 @@
<workItem from="1607812206779" duration="8920000" />
<workItem from="1607939225501" duration="15331000" />
<workItem from="1607988216099" duration="18000" />
<workItem from="1607988810219" duration="607000" />
</task>
<servers />
</component>
......@@ -293,6 +296,23 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/bico/ops/vis.py</url>
<line>10</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/bico/bico.py</url>
<line>369</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/bico/ops/vis.py</url>
<line>175</line>
<option name="timeStamp" value="4" />
</line-breakpoint>
</breakpoints>
<default-breakpoints>
<breakpoint type="python-exception">
<properties notifyOnTerminate="true" exception="BaseException">
......@@ -310,7 +330,7 @@
<SUITE FILE_PATH="coverage/BICO$main.coverage" NAME="bico Coverage Results" MODIFIED="1598258463691" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$gui.coverage" NAME="gui Coverage Results" MODIFIED="1606435918815" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$main.coverage" NAME="main Coverage Results" MODIFIED="1596498134562" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$start_bico.coverage" NAME="start_bico Coverage Results" MODIFIED="1607987599630" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$start_bico.coverage" NAME="start_bico Coverage Results" MODIFIED="1607989420103" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/bico" />
<SUITE FILE_PATH="coverage/BICO_Binary_Converter$example.coverage" NAME="example Coverage Results" MODIFIED="1606348759035" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/example" />
</component>
</project>
\ No newline at end of file
......@@ -15,6 +15,7 @@ from gui.gui import Ui_MainWindow
from ops import bin, format_data, vis, file, stats
from settings import _version
# TODO dataok check for hist
# TODO LATER parallelize, multiprocessing?
# import multiprocessing as mp
......
......@@ -343,7 +343,7 @@ def convert_val_to_octal(var_val):
# bin(int(var_val))[2:].zfill(16)
oct_val = oct(var_val_int) # Note: has octal prefix '0o' at start, e.g. '0o0'
oct_val_no_prefix = oct_val[2:] # Remove octal prefix from val
return oct_val_no_prefix
return int(oct_val_no_prefix)
def convert_val_to_octal_lgr(var_val):
......
......@@ -167,9 +167,12 @@ def high_res_histogram(df, outfile, outdir, logger):
size=8, color='black', backgroundcolor='none', zorder=100)
col_idx = -1
for col in dblock_df.columns:
print(f"HIST {col}")
col_idx += 1
ax = axes[col_idx]
# dataok = check_plot_data(ax=ax, df=dblock_df, col=col)
if not dblock_df[col].dropna().empty:
ax.hist(dblock_df[col], bins=20)
_default_format(ax=ax, width=1, length=2, txt_xlabel="", txt_ylabel="Counts", fontsize=7)
......@@ -262,6 +265,7 @@ def check_plot_data(ax, df, col):
dataok = False
isnumeric = False if df[col].dtypes == object else True
ishex = False if 'hexadecimal_value' not in col[1] else True
# isoctal = False if 'octal' not in col[1] else True
isemtpy = False if not df[col].dropna().empty else True
txt_warning = "-NOT-FOUND-"
......@@ -273,6 +277,12 @@ def check_plot_data(ax, df, col):
txt_warning = f"NOTE: Variable {col} is a HEXADECIMAL (non-numeric) value " \
f"and was therefore not plotted."
# if not isemtpy and not isnumeric and not ishex and isoctal:
# # Expected non-numeric octal data, values available
# facecolor = 'xkcd:green'
# txt_warning = f"NOTE: Variable {col} is a OCTAL (non-numeric) value " \
# f"and was therefore not plotted."
if not isemtpy and not isnumeric and not ishex:
# General non-numeric data, values available
facecolor = 'xkcd:salmon'
......
run_id=BICO-20201215-001320
run_id=BICO-20201215-004608
# INSTRUMENTS
# ===========
......@@ -35,12 +35,12 @@ select_random_files=0
# OUTPUT
# ======
dir_out=P:/Flux/RDS_calculations/INO/AES/BICO
dir_out_run=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320
dir_out_run_log=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320\log
dir_out_run_plots=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320\plots
dir_out_run_plots_hires=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320\plots\hires
dir_out_run_plots_agg=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320\plots\agg
dir_out_run_raw_data_csv=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-001320\raw_data_csv
dir_out_run=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608
dir_out_run_log=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608\log
dir_out_run_plots=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608\plots
dir_out_run_plots_hires=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608\plots\hires
dir_out_run_plots_agg=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608\plots\agg
dir_out_run_raw_data_csv=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004608\raw_data_csv
file_compression=None
......
run_id=BICO-20201215-000308
run_id=BICO-20201215-004342
# INSTRUMENTS
# ===========
......@@ -35,12 +35,12 @@ select_random_files=0
# OUTPUT
# ======
dir_out=P:/Flux/RDS_calculations/INO/AES/BICO
dir_out_run=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308
dir_out_run_log=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308\log
dir_out_run_plots=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308\plots
dir_out_run_plots_hires=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308\plots\hires
dir_out_run_plots_agg=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308\plots\agg
dir_out_run_raw_data_csv=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-000308\raw_data_csv
dir_out_run=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342
dir_out_run_log=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342\log
dir_out_run_plots=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342\plots
dir_out_run_plots_hires=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342\plots\hires
dir_out_run_plots_agg=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342\plots\agg
dir_out_run_raw_data_csv=P:\Flux\RDS_calculations\INO\AES\BICO\BICO-20201215-004342\raw_data_csv
file_compression=None
......
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