From 2425e0f91bdb94f10804e07d5d95eedae622bd23 Mon Sep 17 00:00:00 2001
From: Recolic Keghart <root@recolic.net>
Date: Wed, 27 Dec 2017 16:49:21 +0800
Subject: [PATCH] update PhotoelectricEffect exp
---
PhotoelectricEffect/IU1.csv | 24 ++++++++++++++++++
PhotoelectricEffect/IU2.csv | 24 ++++++++++++++++++
PhotoelectricEffect/IU3.csv | 24 ++++++++++++++++++
PhotoelectricEffect/calc_h.dat | 6 +++++
PhotoelectricEffect/draw.py | 25 +++++++++++++------
PhotoelectricEffect/{ => others_data}/1.csv | 0
PhotoelectricEffect/{ => others_data}/2-1.csv | 0
PhotoelectricEffect/{ => others_data}/2-2.csv | 0
PhotoelectricEffect/{ => others_data}/2-3.csv | 0
PhotoelectricEffect/{ => others_data}/3-1.csv | 0
PhotoelectricEffect/{ => others_data}/3-2.csv | 0
PhotoelectricEffect/{ => others_data}/t1.txt | 0
PhotoelectricEffect/{ => others_data}/tt2-1 | 0
PhotoelectricEffect/{ => others_data}/tt2-2 | 0
PhotoelectricEffect/{ => others_data}/tt2-3 | 0
test.py | 7 ++++--
16 files changed, 100 insertions(+), 10 deletions(-)
create mode 100644 PhotoelectricEffect/IU1.csv
create mode 100644 PhotoelectricEffect/IU2.csv
create mode 100644 PhotoelectricEffect/IU3.csv
create mode 100644 PhotoelectricEffect/calc_h.dat
rename PhotoelectricEffect/{ => others_data}/1.csv (100%)
rename PhotoelectricEffect/{ => others_data}/2-1.csv (100%)
rename PhotoelectricEffect/{ => others_data}/2-2.csv (100%)
rename PhotoelectricEffect/{ => others_data}/2-3.csv (100%)
rename PhotoelectricEffect/{ => others_data}/3-1.csv (100%)
rename PhotoelectricEffect/{ => others_data}/3-2.csv (100%)
rename PhotoelectricEffect/{ => others_data}/t1.txt (100%)
rename PhotoelectricEffect/{ => others_data}/tt2-1 (100%)
rename PhotoelectricEffect/{ => others_data}/tt2-2 (100%)
rename PhotoelectricEffect/{ => others_data}/tt2-3 (100%)
diff --git a/PhotoelectricEffect/IU1.csv b/PhotoelectricEffect/IU1.csv
new file mode 100644
index 0000000..cc630ec
--- /dev/null
+++ b/PhotoelectricEffect/IU1.csv
@@ -0,0 +1,24 @@
+-1.7,0
+-1.5,0.7
+0,5.6
+1.5,24.3
+3,33.9
+4.5,41.2
+6,45.6
+7.5,50.2
+9,55
+10.5,59
+12,63
+13.5,66.7
+15,70.1
+16.5,72.5
+18,75.2
+19.5,77.5
+21,80
+22.5,82.4
+24,84.4
+25.5,86.3
+27,91.7
+28.5,92.8
+30,93.3
+31.5,92.6
diff --git a/PhotoelectricEffect/IU2.csv b/PhotoelectricEffect/IU2.csv
new file mode 100644
index 0000000..3f8284e
--- /dev/null
+++ b/PhotoelectricEffect/IU2.csv
@@ -0,0 +1,24 @@
+-0.6,0.1
+,
+0,22.7
+1.5,86
+3,121.7
+4.5,145.9
+6,165.5
+7.5,178.5
+9,203
+10.5,219
+12,231
+13.5,246
+15,260
+16.5,268
+18,280
+19.5,289
+21,300
+22.5,306
+24,315
+25.5,319
+27,330
+28.5,333
+30,340
+31.5,341
diff --git a/PhotoelectricEffect/IU3.csv b/PhotoelectricEffect/IU3.csv
new file mode 100644
index 0000000..206df89
--- /dev/null
+++ b/PhotoelectricEffect/IU3.csv
@@ -0,0 +1,24 @@
+-0.5,0
+,
+0,72
+1.5,319
+3,467
+4.5,563
+6,631
+7.5,689
+9,758
+10.5,816
+12,865
+13.5,920
+15,987
+16.5,1045
+18,1085
+19.5,1115
+21,1125
+22.5,1169
+24,1192
+25.5,1216
+27,1255
+28.5,1273
+30,1299
+31.5,1331
diff --git a/PhotoelectricEffect/calc_h.dat b/PhotoelectricEffect/calc_h.dat
new file mode 100644
index 0000000..4839828
--- /dev/null
+++ b/PhotoelectricEffect/calc_h.dat
@@ -0,0 +1,6 @@
+# calculate h, draw img, poly1
+8.214e14 -1.715
+7.408e14 -1.466
+6.879e14 -1.180
+5.490e14 -0.620
+5.196e14 -0.509
diff --git a/PhotoelectricEffect/draw.py b/PhotoelectricEffect/draw.py
index 49ad444..14a6c60 100755
--- a/PhotoelectricEffect/draw.py
+++ b/PhotoelectricEffect/draw.py
@@ -4,14 +4,23 @@ import sys
sys.path.append('..')
import quickmap
-x1, y1 = quickmap.DataFileToXYArray('1.csv', wordDelimiter = ',')
-quickmap.GetMap(x1, y1, polyLine=True)
+x1,y1 = quickmap.DataFileToXYArray('calc_h.dat')
+quickmap.GetMap(x1,y1,polyLine=True)
-x21, y21 = quickmap.DataFileToXYArray('2-1.csv', wordDelimiter = ',')
-x22, y22 = quickmap.DataFileToXYArray('2-2.csv', wordDelimiter = ',')
-x23, y23 = quickmap.DataFileToXYArray('2-3.csv', wordDelimiter = ',')
+x21, y21 = quickmap.DataFileToXYArray('IU1.csv', wordDelimiter = ',')
+x22, y22 = quickmap.DataFileToXYArray('IU2.csv', wordDelimiter = ',')
+x23, y23 = quickmap.DataFileToXYArray('IU3.csv', wordDelimiter = ',')
quickmap.GetMultiMap(quickmap.GetLine(x21, y21, smoothLine=True) + quickmap.GetLine(x22, y22, smoothLine=True) + quickmap.GetLine(x23, y23, smoothLine=True))
-x31, y31 = quickmap.DataFileToXYArray('3-1.csv', wordDelimiter = ',')
-x32, y32 = quickmap.DataFileToXYArray('3-2.csv', wordDelimiter = ',')
-quickmap.GetMultiMap(quickmap.GetLine(x31, y31, polyLine=True) + quickmap.GetLine(x32, y32, polyLine=True))
+
+#x1, y1 = quickmap.DataFileToXYArray('1.csv', wordDelimiter = ',')
+#quickmap.GetMap(x1, y1, polyLine=True)
+#
+#x21, y21 = quickmap.DataFileToXYArray('2-1.csv', wordDelimiter = ',')
+#x22, y22 = quickmap.DataFileToXYArray('2-2.csv', wordDelimiter = ',')
+#x23, y23 = quickmap.DataFileToXYArray('2-3.csv', wordDelimiter = ',')
+#quickmap.GetMultiMap(quickmap.GetLine(x21, y21, smoothLine=True) + quickmap.GetLine(x22, y22, smoothLine=True) + quickmap.GetLine(x23, y23, smoothLine=True))
+#
+#x31, y31 = quickmap.DataFileToXYArray('3-1.csv', wordDelimiter = ',')
+#x32, y32 = quickmap.DataFileToXYArray('3-2.csv', wordDelimiter = ',')
+#quickmap.GetMultiMap(quickmap.GetLine(x31, y31, polyLine=True) + quickmap.GetLine(x32, y32, polyLine=True))
diff --git a/PhotoelectricEffect/1.csv b/PhotoelectricEffect/others_data/1.csv
similarity index 100%
rename from PhotoelectricEffect/1.csv
rename to PhotoelectricEffect/others_data/1.csv
diff --git a/PhotoelectricEffect/2-1.csv b/PhotoelectricEffect/others_data/2-1.csv
similarity index 100%
rename from PhotoelectricEffect/2-1.csv
rename to PhotoelectricEffect/others_data/2-1.csv
diff --git a/PhotoelectricEffect/2-2.csv b/PhotoelectricEffect/others_data/2-2.csv
similarity index 100%
rename from PhotoelectricEffect/2-2.csv
rename to PhotoelectricEffect/others_data/2-2.csv
diff --git a/PhotoelectricEffect/2-3.csv b/PhotoelectricEffect/others_data/2-3.csv
similarity index 100%
rename from PhotoelectricEffect/2-3.csv
rename to PhotoelectricEffect/others_data/2-3.csv
diff --git a/PhotoelectricEffect/3-1.csv b/PhotoelectricEffect/others_data/3-1.csv
similarity index 100%
rename from PhotoelectricEffect/3-1.csv
rename to PhotoelectricEffect/others_data/3-1.csv
diff --git a/PhotoelectricEffect/3-2.csv b/PhotoelectricEffect/others_data/3-2.csv
similarity index 100%
rename from PhotoelectricEffect/3-2.csv
rename to PhotoelectricEffect/others_data/3-2.csv
diff --git a/PhotoelectricEffect/t1.txt b/PhotoelectricEffect/others_data/t1.txt
similarity index 100%
rename from PhotoelectricEffect/t1.txt
rename to PhotoelectricEffect/others_data/t1.txt
diff --git a/PhotoelectricEffect/tt2-1 b/PhotoelectricEffect/others_data/tt2-1
similarity index 100%
rename from PhotoelectricEffect/tt2-1
rename to PhotoelectricEffect/others_data/tt2-1
diff --git a/PhotoelectricEffect/tt2-2 b/PhotoelectricEffect/others_data/tt2-2
similarity index 100%
rename from PhotoelectricEffect/tt2-2
rename to PhotoelectricEffect/others_data/tt2-2
diff --git a/PhotoelectricEffect/tt2-3 b/PhotoelectricEffect/others_data/tt2-3
similarity index 100%
rename from PhotoelectricEffect/tt2-3
rename to PhotoelectricEffect/others_data/tt2-3
diff --git a/test.py b/test.py
index 6f6ccf3..5fb2bcf 100644
--- a/test.py
+++ b/test.py
@@ -12,9 +12,12 @@
import quickmap
-x, y = quickmap.DataFileToXYArray('test.dat')
+#x, y = quickmap.DataFileToXYArray('test.dat')
+x=[8.214,7.408,6.879,5.490,5.196]
+x=[i * 10**14 for i in x]
+y=[-1.715,-1.466,-1.180,-0.620,-0.509]
quickmap.GetMap(x,y,polyLine=True)
-
+exit(0)
x=[50,80,110,140,170,200]
y=[63.7,75.0,93.7,112.0,126.1,143.0]
--
GitLab