Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: HiSPARC/correlation
base: 6302e39fd0
...
head fork: HiSPARC/correlation
compare: a91186858f
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
View
4 .gitignore
@@ -1,3 +1,7 @@
+# Specific
+*.h5
+*.png
+
# Python
*.pyc
*.pyo
View
2  down_data_in_parts_tot.py
@@ -177,7 +177,7 @@ def download_part(user_hisparc_station_id, start, stop):
hisp_station = int(user_hisparc_station_id)
tree = '/s' + user_hisparc_station_id
path = 'data.root.s' + user_hisparc_station_id
- filename = 'data_s%d_%s_%s.h5' % (user_hisparc_station_id,
+ filename = 'data_s%d_%s_%s.h5' % (hisp_station,
start.strftime('%Y,%m,%d'),
stop.strftime('%Y,%m,%d'))
View
13 find_MPV_pulseheights2.py
@@ -4,7 +4,7 @@
from get_number_of_variable_values import get_number_of_variable_values
def func(x, a, b, c):
- return a*(x-b)**2 + c
+ return a * (x - b)**2 + c
# pulseheights_list = [array_day1(p_plate_1, p_plate_2, p_plate_3, p_plate_4), arrayday2(...) etc.]
# plot_variable = [('pulseheights','data_s501_2011,12,7 - 2011,12,8.h5','501','events')]
@@ -47,18 +47,14 @@ def find_MPV_pulseheights(pulseheights_list,plot_variable,time,number_of_plates)
try:
-
for p in range(len(pulseheights_list)):
-
try:
-
#print 'Time interval %d of %d.' % (pulseheights_list.index(p)+1, len(pulseheights_list))
MPV_MIPs = []
"""
# check the number of scintillation plates
-
print pulseheights_list[p][:3]
p1,p2,p3,p4 = zip(*pulseheights_list[p])
print p1[:3]
@@ -166,14 +162,11 @@ def find_MPV_pulseheights(pulseheights_list,plot_variable,time,number_of_plates)
# Therefore (bins[:-1] + bins[1:])/2 = [(0+500)/2 , (500+1000)/2, (1000+1500)/2]
# = [ 250 , 750 , 1250 ] i.e. the x-value for the CENTER side of each bin
-
del bins
#print bin_centers
plt.clf()
-
-
try:
popt, pcov = curve_fit(func, bin_centers, values,[1,MPV_value,1])
del pcov
@@ -224,7 +217,6 @@ def find_MPV_pulseheights(pulseheights_list,plot_variable,time,number_of_plates)
print ''
success = False
-
else:
MPV_MIPs.append(MPV_value)
print ''
@@ -243,7 +235,6 @@ def find_MPV_pulseheights(pulseheights_list,plot_variable,time,number_of_plates)
print 'Close plot to continue...'
plt.show()
-
elif skip == True:
MPV_MIPs.append(None)
print '------------------------------------------------------------'
@@ -251,9 +242,9 @@ def find_MPV_pulseheights(pulseheights_list,plot_variable,time,number_of_plates)
timing.append(time[p])
except ValueError:
-
print 'Error'
except ValueError:
print 'Error'
+
return MPV_list, number_of_plates,timing
View
BIN  hisparc/__init__.pyc
Binary file not shown
View
BIN  hisparc/analysis/__init__.pyc
Binary file not shown
View
BIN  hisparc/analysis/coincidences.pyc
Binary file not shown
View
BIN  hisparc/analysis/kascade_coincidences.pyc
Binary file not shown
View
BIN  hisparc/analysis/traces.pyc
Binary file not shown
View
BIN  hisparc/containers.pyc
Binary file not shown
View
BIN  hisparc/gpstime.pyc
Binary file not shown
View
BIN  hisparc/kascade.pyc
Binary file not shown
View
BIN  hisparc/publicdb.pyc
Binary file not shown
View
7 show_downloaded_file_names.py
@@ -6,11 +6,6 @@ def show_downloaded_file_names(kind_of_data_in_table):
print '| |'
print '| SHOWER WEATHER |'
print '| |'
- blank = '| |'
for i in kind_of_data_in_table:
- length_string = len(i[0]) + len(str(i[1])) + len(str(i[2]))
- if length_string <= 51:
- print '| ' + str(i) + blank[2+length_string:]
- else:
- print i[0], length_string
+ print '| %-38s %-6s %-6s |' % (i[0], str(i[1]), str(i[2]))
print '|_____________________________________________________________|'

No commit comments for this range

Something went wrong with that request. Please try again.