diff --git a/noinfo/create_dplong_table.py b/noinfo/create_dplong_table.py index 6186c3d8b..3e2365676 100755 --- a/noinfo/create_dplong_table.py +++ b/noinfo/create_dplong_table.py @@ -44,7 +44,7 @@ def print_caveline(number, l, d, w, cave): def parse_csvfile(): caveslist = [] print "Calculating SMK-system extent... ", - os.popen("cavern -v7 ../loser/smk-system -o noinfo/smk-system.3d") + os.popen("cavern -v7 ../loser/smk-system.svx -o noinfo/smk-system.3d") l,d,w = map(float, chomp(os.popen(CS_BINARY + " noinfo/smk-system -c ").read()).split("\t")) caveslist.append(["", l,d,w, {"Name" : "<i>Schwarzmooskogelhöhlensystem</i>", "Autogen file" : ""}]) print "done\nParsing CSV file" @@ -122,13 +122,11 @@ h3 {text-align: center} the plateau for which we have survey centerline data. At present, that's only %d out of 250 or so, but the missing ones are mostly very small and obscure; the notable exceptions are some caves explored by other groups (35, LA25, -BS17), and CUCC caves 71, 76, 92, 96 and 97. Of the latter 76 (by far the most -significant of these) is in the process of being re-explored, and the figures -in the table are for the portions revisited so far.</p> +BS17), and CUCC caves 71, 92, 96 and 97.</p> -<p>The eight main constitutent parts of the Schwarzmooskogel master system (40, -41, 78, 88, 115, 116, 136, 144 and 161) are listed separately in the table, -although in some cases there is some ambiguity as to where to draw the lines; +<p>The eighteen caves that now comprise the Schwarzmooskogel master system (32, 40, +41, 78, 87, 88, 107, 115, 136, 142, 143, 144, 161, 204, 258 and 264) are listed separately in the table, +although in some cases the divisions are more historical than structural or logical; but for comparison I have also included the measurements of the whole system. </p> diff --git a/years/2015/logbkimg01.jpeg b/years/2015/logbkimg01.jpeg new file mode 100644 index 000000000..bee44e98b Binary files /dev/null and b/years/2015/logbkimg01.jpeg differ diff --git a/years/2015/logbkimg02.jpeg b/years/2015/logbkimg02.jpeg new file mode 100644 index 000000000..1b483b41c Binary files /dev/null and b/years/2015/logbkimg02.jpeg differ diff --git a/years/2015/logbkimg03.jpeg b/years/2015/logbkimg03.jpeg new file mode 100644 index 000000000..ea909aaee Binary files /dev/null and b/years/2015/logbkimg03.jpeg differ diff --git a/years/2015/logbkimg04.jpeg b/years/2015/logbkimg04.jpeg new file mode 100644 index 000000000..d82b1126b Binary files /dev/null and b/years/2015/logbkimg04.jpeg differ diff --git a/years/2015/logbkimg05.jpeg b/years/2015/logbkimg05.jpeg new file mode 100644 index 000000000..32a2d56d7 Binary files /dev/null and b/years/2015/logbkimg05.jpeg differ diff --git a/years/2015/logbkimg06.jpeg b/years/2015/logbkimg06.jpeg new file mode 100644 index 000000000..f381a9dbd Binary files /dev/null and b/years/2015/logbkimg06.jpeg differ diff --git a/years/2015/logbkimg07.jpeg b/years/2015/logbkimg07.jpeg new file mode 100644 index 000000000..8d029a684 Binary files /dev/null and b/years/2015/logbkimg07.jpeg differ diff --git a/years/2015/logbkimg08.jpeg b/years/2015/logbkimg08.jpeg new file mode 100644 index 000000000..ff476a0b7 Binary files /dev/null and b/years/2015/logbkimg08.jpeg differ diff --git a/years/2015/logbkimg09.jpeg b/years/2015/logbkimg09.jpeg new file mode 100644 index 000000000..9a70fd103 Binary files /dev/null and b/years/2015/logbkimg09.jpeg differ diff --git a/years/2015/logbkimg10.jpeg b/years/2015/logbkimg10.jpeg new file mode 100644 index 000000000..df831d81d Binary files /dev/null and b/years/2015/logbkimg10.jpeg differ diff --git a/years/2015/logbkimg11.jpeg b/years/2015/logbkimg11.jpeg new file mode 100644 index 000000000..4426ab3b6 Binary files /dev/null and b/years/2015/logbkimg11.jpeg differ diff --git a/years/2015/logbkimg12.jpeg b/years/2015/logbkimg12.jpeg new file mode 100644 index 000000000..d949d9fd2 Binary files /dev/null and b/years/2015/logbkimg12.jpeg differ diff --git a/years/2015/logbkimg13.jpeg b/years/2015/logbkimg13.jpeg new file mode 100644 index 000000000..cd08f019c Binary files /dev/null and b/years/2015/logbkimg13.jpeg differ diff --git a/years/2015/logbkimg14.jpeg b/years/2015/logbkimg14.jpeg new file mode 100644 index 000000000..fee0fa73d Binary files /dev/null and b/years/2015/logbkimg14.jpeg differ diff --git a/years/2015/logbkimg15.jpeg b/years/2015/logbkimg15.jpeg new file mode 100644 index 000000000..1fe2bc93c Binary files /dev/null and b/years/2015/logbkimg15.jpeg differ diff --git a/years/2015/logbkimg16.jpeg b/years/2015/logbkimg16.jpeg new file mode 100644 index 000000000..2f784fa1b Binary files /dev/null and b/years/2015/logbkimg16.jpeg differ diff --git a/years/2015/logbkimg17.jpeg b/years/2015/logbkimg17.jpeg new file mode 100644 index 000000000..c3835b37b Binary files /dev/null and b/years/2015/logbkimg17.jpeg differ diff --git a/years/2015/logbkimg18.jpeg b/years/2015/logbkimg18.jpeg new file mode 100644 index 000000000..60de98dcf Binary files /dev/null and b/years/2015/logbkimg18.jpeg differ diff --git a/years/2015/logbkimg19.jpeg b/years/2015/logbkimg19.jpeg new file mode 100644 index 000000000..717bf606b Binary files /dev/null and b/years/2015/logbkimg19.jpeg differ diff --git a/years/2015/logbkimg20.jpeg b/years/2015/logbkimg20.jpeg new file mode 100644 index 000000000..76e4c4598 Binary files /dev/null and b/years/2015/logbkimg20.jpeg differ diff --git a/years/2015/logbkimg21.jpeg b/years/2015/logbkimg21.jpeg new file mode 100644 index 000000000..d7b7c7ab3 Binary files /dev/null and b/years/2015/logbkimg21.jpeg differ diff --git a/years/2015/logbkimg22.jpeg b/years/2015/logbkimg22.jpeg new file mode 100644 index 000000000..f4e4d01fb Binary files /dev/null and b/years/2015/logbkimg22.jpeg differ diff --git a/years/2015/logbkimg23.jpeg b/years/2015/logbkimg23.jpeg new file mode 100644 index 000000000..9aaa10d57 Binary files /dev/null and b/years/2015/logbkimg23.jpeg differ diff --git a/years/2015/logbkimg24.jpeg b/years/2015/logbkimg24.jpeg new file mode 100644 index 000000000..9383b3532 Binary files /dev/null and b/years/2015/logbkimg24.jpeg differ diff --git a/years/2015/logbkimg25.jpeg b/years/2015/logbkimg25.jpeg new file mode 100644 index 000000000..330e3cc54 Binary files /dev/null and b/years/2015/logbkimg25.jpeg differ diff --git a/years/2015/logbkimg26.jpeg b/years/2015/logbkimg26.jpeg new file mode 100644 index 000000000..59afc5c4c Binary files /dev/null and b/years/2015/logbkimg26.jpeg differ