From: Sam Moore Date: Wed, 25 Jul 2012 10:00:01 +0000 (+0800) Subject: Automatic commit Wed Jul 25 18:00:01 WST 2012 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=49ec3eb8bb9c070777f8f76b918c4eec4057bee7;p=matches%2Fhonours.git Automatic commit Wed Jul 25 18:00:01 WST 2012 Never be led astray onto the path of virtue. --- diff --git a/research/TCS/2012-07-25/175831.dat b/research/TCS/2012-07-25/175831.dat new file mode 100644 index 00000000..3541f9d2 --- /dev/null +++ b/research/TCS/2012-07-25/175831.dat @@ -0,0 +1,135 @@ +# Comment: Measure emission&sample current varying with time, constant initial energy. +# Experiment 2012-07-25 17:58:31.307911 +# Polling for Nones. +# DAC = 1500 +# Data: +# time DAC ADC4 ADC5 +2.80824828148 1500 146.22 33.21 30.80 1.50 +3.48978495598 1500 144.40 33.75 30.76 1.45 +4.16921186447 1500 143.4 34.22 30.79 1.49 +4.84676146507 1500 140.63 34.69 30.79 1.46 +5.5279173851 1500 139.39 35.18 30.81 1.54 +6.20923042297 1500 137.15 35.4 30.80 1.47 +6.88932394981 1500 135.39 34.99 30.76 1.43 +7.56729984283 1500 133.57 35.8 30.80 1.55 +8.2452480793 1500 133.90 35.25 30.78 1.45 +8.92528343201 1500 132.3 35.39 30.74 1.48 +9.60276985168 1500 131.23 35.35 30.77 1.51 +10.2807900906 1500 129.88 35.26 30.78 1.50 +10.96083951 1500 128.40 35.14 30.80 1.48 +11.6388158798 1500 127.62 34.93 30.79 1.49 +12.3152713776 1500 125.34 35.45 30.81 1.50 +12.9913322926 1500 123.94 35.51 30.80 1.48 +13.6672973633 1500 124.83 34.68 30.75 1.48 +14.3457314968 1500 124.50 35.52 30.76 1.47 +15.0253250599 1500 123.80 35.38 30.78 1.48 +15.7033264637 1500 123.19 35.15 30.73 1.43 +16.381248951 1500 122.45 35.56 30.76 1.44 +17.0607969761 1500 121.78 35.31 30.70 1.45 +17.738765955 1500 121.59 34.97 30.71 1.46 +18.4127013683 1500 119.18 35.5 30.74 1.51 +19.0867455006 1500 119.55 35.1 30.76 1.50 +19.7627959251 1500 119.62 35.18 30.72 1.49 +20.4387853146 1500 118.73 35.1 30.81 1.51 +21.1147534847 1500 117.78 34.98 30.75 1.44 +21.7927725315 1500 116.64 35.47 30.75 1.45 +22.4730417728 1500 115.88 35.19 30.72 1.45 +23.1536719799 1500 116.20 35.16 30.78 1.47 +23.834094286 1500 115.44 35.28 30.78 1.48 +24.5098097324 1500 115.19 35.3 30.74 1.44 +25.1816740036 1500 116.57 35.9 30.67 1.45 +25.8573572636 1500 115.2 34.92 30.75 1.46 +26.5372474194 1500 114.29 34.65 30.76 1.47 +27.2181622982 1500 114.73 34.88 30.76 1.47 +27.8977820873 1500 113.72 34.80 30.75 1.47 +28.5772869587 1500 113.57 34.38 30.72 1.49 +29.2547752857 1500 113.6 34.91 30.75 1.46 +29.9288370609 1500 112.23 35.4 30.69 1.47 +30.60283041 1500 113.79 34.88 30.75 1.47 +31.2787544727 1500 113.26 34.91 30.75 1.45 +31.9553349018 1500 111.69 34.84 30.75 1.48 +32.6338613033 1500 111.41 34.91 30.77 1.43 +33.3067324162 1500 111.0 35.0 30.69 1.45 +33.9809579849 1500 111.82 34.68 30.75 1.46 +34.6594083309 1500 112.6 34.64 30.74 1.43 +35.337274313 1500 110.47 34.61 30.77 1.46 +36.0152585506 1500 110.22 35.0 30.75 1.43 +36.6936774254 1500 109.86 34.97 30.77 1.43 +37.3712379932 1500 109.47 34.79 30.76 1.44 +38.0467903614 1500 110.17 34.63 30.73 1.51 +38.7227599621 1500 111.11 34.62 30.70 1.47 +39.3992393017 1500 109.68 34.33 30.68 1.45 +40.0737597942 1500 109.1 34.70 30.76 1.50 +40.74929142 1500 109.41 34.27 30.75 1.50 +41.4272787571 1500 109.0 34.35 30.74 1.45 +42.105723381 1500 109.66 34.96 30.72 1.45 +42.7872860432 1500 109.72 34.56 30.77 1.49 +43.4687740803 1500 108.55 34.22 30.72 1.43 +44.1487028599 1500 108.87 34.64 30.73 1.46 +44.8287780285 1500 108.67 34.44 30.72 1.49 +45.5068013668 1500 108.39 34.43 30.72 1.53 +46.1832492352 1500 108.74 34.65 30.70 1.47 +46.8613040447 1500 108.10 34.47 30.75 1.44 +47.5412619114 1500 107.11 34.11 30.73 1.45 +48.2197272778 1500 107.74 34.22 30.73 1.53 +48.8957958221 1500 107.74 34.98 30.71 1.48 +49.5717217922 1500 107.87 34.29 30.74 1.49 +50.2479903698 1500 108.15 34.16 30.74 1.45 +50.9235568047 1500 108.1 34.95 30.75 1.48 +51.5993700027 1500 106.92 34.26 30.75 1.46 +52.2772295475 1500 106.8 34.24 30.77 1.49 +52.9568045139 1500 105.37 34.80 30.76 1.44 +53.6352870464 1500 105.43 34.43 30.75 1.44 +54.3157148361 1500 105.17 34.39 30.79 1.51 +54.9947719574 1500 104.55 34.61 30.75 1.44 +55.6731078625 1500 104.85 34.44 30.79 1.49 +56.3516190052 1500 104.82 34.37 30.75 1.47 +57.0278570652 1500 105.13 34.12 30.67 1.48 +57.7053203583 1500 105.83 34.49 30.75 1.46 +58.383244276 1500 105.57 34.42 30.73 1.47 +59.059268713 1500 104.81 33.97 30.77 1.53 +59.7351272106 1500 104.18 34.55 30.78 1.48 +60.4107363224 1500 103.92 34.46 30.72 1.46 +61.0872666836 1500 104.77 34.12 30.76 1.47 +61.7652978897 1500 105.28 34.73 30.77 1.46 +62.443820715 1500 104.98 34.50 30.69 1.43 +63.1217992306 1500 104.60 34.23 30.72 1.46 +63.7988193035 1500 104.64 34.23 30.74 1.44 +64.4772803783 1500 102.95 34.23 30.69 1.43 +65.1577250957 1500 103.44 34.10 30.77 1.50 +65.835798502 1500 103.23 34.45 30.75 1.47 +66.5126984119 1500 102.85 34.49 30.72 1.46 +67.1906559467 1500 102.82 34.27 30.79 1.44 +67.8677914143 1500 102.98 34.40 30.71 1.50 +68.5440545082 1500 103.73 34.9 30.72 1.51 +69.2195544243 1500 104.52 34.1 30.72 1.50 +69.8968365192 1500 102.89 34.22 30.73 1.44 +70.5733582973 1500 103.8 33.95 30.77 1.48 +71.2474348545 1500 102.73 33.87 30.77 1.49 +71.9253017902 1500 102.97 34.28 30.72 1.45 +72.6047968864 1500 103.41 34.31 30.75 1.48 +73.2832405567 1500 103.40 33.90 30.73 1.49 +73.9613139629 1500 103.30 34.38 30.76 1.46 +74.6392447948 1500 103.48 34.45 30.69 1.44 +75.315179348 1500 103.0 33.92 30.72 1.47 +75.9927690029 1500 101.62 34.16 30.80 1.47 +76.6692783833 1500 102.9 34.4 30.79 1.47 +77.3417649269 1500 101.66 34.3 30.66 1.46 +78.0158140659 1500 102.85 34.28 30.69 1.45 +78.6938018799 1500 102.41 34.15 30.73 1.47 +79.3713023663 1500 102.21 33.83 30.72 1.48 +80.0473937988 1500 101.49 34.16 30.78 1.48 +80.7232954502 1500 100.90 34.68 30.76 1.52 +81.3994119167 1500 101.58 33.98 30.75 1.49 +82.0774843693 1500 102.58 34.27 30.76 1.49 +82.7558078766 1500 101.98 34.18 30.72 1.47 +83.4312744141 1500 102.61 34.35 30.68 1.47 +84.1052458286 1500 101.69 33.77 30.74 1.49 +84.7798202038 1500 100.43 34.37 30.72 1.46 +85.4572899342 1500 101.80 33.91 30.79 1.49 +86.137714386 1500 101.26 33.77 30.70 1.46 +86.8152873516 1500 100.81 34.34 30.69 1.46 +87.4893004894 1500 102.48 34.12 30.72 1.44 +88.1662552357 1500 101.48 33.78 30.70 1.47 +88.8458225727 1500 101.78 34.9 30.74 1.48 +89.5252819061 1500 101.75 34.22 30.70 1.47 diff --git a/research/TCS/2012-07-25/config.dat b/research/TCS/2012-07-25/config.dat index 5334fcb6..6ba4b713 100644 --- a/research/TCS/2012-07-25/config.dat +++ b/research/TCS/2012-07-25/config.dat @@ -1,4 +1,4 @@ -# Initialise 2012-07-25 14:57:25.405709 +# Initialise 2012-07-25 17:58:31.238569 # calibrate[ADC_Rin] = [None, None, None, None, 15000, 1100, 1100, 1100] # calibrate[ADC_Rvar] = [None, None, None, None, 1000, 5000, 10000, 50000] # calibrate[ADC] = [None, None, None, None, None, None, None, None] @@ -15,5 +15,5 @@ # aquire[DAC_Settle] = 2.0 # aquire[ADC_Ie] = 4 # aquire[start_date] = 2012-07-25 -# Ready 2012-07-25 14:57:25.406035 +# Ready 2012-07-25 17:58:31.238829 # EOF diff --git a/research/TCS/config.dat b/research/TCS/config.dat index 5334fcb6..6ba4b713 100644 --- a/research/TCS/config.dat +++ b/research/TCS/config.dat @@ -1,4 +1,4 @@ -# Initialise 2012-07-25 14:57:25.405709 +# Initialise 2012-07-25 17:58:31.238569 # calibrate[ADC_Rin] = [None, None, None, None, 15000, 1100, 1100, 1100] # calibrate[ADC_Rvar] = [None, None, None, None, 1000, 5000, 10000, 50000] # calibrate[ADC] = [None, None, None, None, None, None, None, None] @@ -15,5 +15,5 @@ # aquire[DAC_Settle] = 2.0 # aquire[ADC_Ie] = 4 # aquire[start_date] = 2012-07-25 -# Ready 2012-07-25 14:57:25.406035 +# Ready 2012-07-25 17:58:31.238829 # EOF diff --git a/research/TCS/interface.py b/research/TCS/interface.py index 996beeb4..9a9b2eb7 100755 --- a/research/TCS/interface.py +++ b/research/TCS/interface.py @@ -215,6 +215,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment = for adc in raw_adc: out.write("\t" + str(adc[1]) + "\t" + str(adc[2])) out.write("\n") + for out in output: if out != sys.stdout: