aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortlatorre <tlatorre@uchicago.edu>2021-01-14 07:56:51 -0600
committertlatorre <tlatorre@uchicago.edu>2021-01-14 07:56:51 -0600
commitd294a76de198ac83794f0cffa32d148919c060c3 (patch)
tree63deeca4cbc1e32f4b028fa1d6dad306da630280
parent4978d81dd462a1dfd7f231b28960589eb4938a48 (diff)
downloadsddm-d294a76de198ac83794f0cffa32d148919c060c3.tar.gz
sddm-d294a76de198ac83794f0cffa32d148919c060c3.tar.bz2
sddm-d294a76de198ac83794f0cffa32d148919c060c3.zip
calculate total number of atmospheric events by summing flux_weights
-rwxr-xr-xutils/chi28
-rwxr-xr-xutils/dm-search8
2 files changed, 8 insertions, 8 deletions
diff --git a/utils/chi2 b/utils/chi2
index 1edc0fd..e9a5f74 100755
--- a/utils/chi2
+++ b/utils/chi2
@@ -660,8 +660,8 @@ if __name__ == '__main__':
for i in range(args.coverage):
# Calculate expected number of events
- N = len(data_mc)*xtrue[0]/atmo_scale_factor
- N_atm = len(data_atm_mc)*xtrue[0]/atmo_scale_factor
+ N = data_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
+ N_atm = data_atm_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
N_muon = len(muon)*xtrue[5]/muon_scale_factor
N_muon_atm = len(muon_atm)*xtrue[5]/muon_scale_factor
@@ -761,8 +761,8 @@ if __name__ == '__main__':
xtrue = truncnorm_scaled(PRIORS_LOW,PRIORS_HIGH,PRIORS,PRIOR_UNCERTAINTIES)
# Calculate expected number of events
- N = len(data_mc)*xtrue[0]/atmo_scale_factor
- N_atm = len(data_atm_mc)*xtrue[0]/atmo_scale_factor
+ N = data_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
+ N_atm = data_atm_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
N_muon = len(muon)*xtrue[5]/muon_scale_factor
N_muon_atm = len(muon_atm)*xtrue[5]/muon_scale_factor
diff --git a/utils/dm-search b/utils/dm-search
index f8a8ff1..a99f210 100755
--- a/utils/dm-search
+++ b/utils/dm-search
@@ -730,8 +730,8 @@ if __name__ == '__main__':
xtrue = sample_priors()
# Calculate expected number of events
- N = len(data_mc)*xtrue[0]/atmo_scale_factor
- N_atm = len(data_atm_mc)*xtrue[0]/atmo_scale_factor
+ N = data_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
+ N_atm = data_atm_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
N_muon = len(muon)*xtrue[5]/muon_scale_factor
N_muon_atm = len(muon_atm)*xtrue[5]/muon_scale_factor
N_dm = xtrue[6]
@@ -811,8 +811,8 @@ if __name__ == '__main__':
xtrue = sample_priors()
# Calculate expected number of events
- N = len(data_mc)*xtrue[0]/atmo_scale_factor
- N_atm = len(data_atm_mc)*xtrue[0]/atmo_scale_factor
+ N = data_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
+ N_atm = data_atm_mc.flux_weight.sum()*xtrue[0]/atmo_scale_factor
N_muon = len(muon)*xtrue[5]/muon_scale_factor
N_muon_atm = len(muon_atm)*xtrue[5]/muon_scale_factor