Skip to content

Commit 8f9a1e2

Browse files
miquelnebotmiquelnebot
committed
Merge branch 'release/v09_15_05'
2 parents 969df78 + 59fc34e commit 8f9a1e2

10 files changed

Lines changed: 81 additions & 61 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1515

1616
find_package(cetmodules 3.20.00 REQUIRED)
17-
project(sbnobj VERSION 09.15.04 LANGUAGES CXX)
17+
project(sbnobj VERSION 09.15.05 LANGUAGES CXX)
1818

1919
message(STATUS
2020
"\n-- ============================================================================="

‎sbnobj/Common/EventGen/MeVPrtl/KaonParent.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎sbnobj/Common/EventGen/MeVPrtl/MeVPrtlDecay.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@ class MeVPrtlDecay {
1717
std::vector<double> daughter_e;
1818
std::vector<int> daughter_pdg;
1919

20-
double decay_width;
21-
double mean_lifetime;
22-
double mean_distance;
20+
// Total widths / distances for all possible decays
21+
double total_decay_width;
22+
double total_mean_lifetime;
23+
double total_mean_distance;
24+
25+
// Fraction of width for allowed decays
26+
double allowed_decay_fraction;
27+
2328
};
2429

2530
} // end namespace ldm

‎sbnobj/Common/EventGen/MeVPrtl/MeVPrtlFlux.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class MeVPrtlFlux {
99
public:
1010
TLorentzVector pos_beamcoord;
1111
TLorentzVector pos;
12-
TLorentzVector kmom_beamcoord;
13-
TLorentzVector kmom;
12+
TLorentzVector mmom_beamcoord;
13+
TLorentzVector mmom;
1414
TLorentzVector mom;
1515
TLorentzVector mom_beamcoord;
1616
TLorentzVector sec;
@@ -22,7 +22,7 @@ class MeVPrtlFlux {
2222
double C4;
2323
double C5;
2424
double mass;
25-
int kaon_pdg;
25+
int meson_pdg;
2626
int secondary_pdg;
2727
int generator;
2828

‎sbnobj/Common/EventGen/MeVPrtl/MeVPrtlTruth.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ evgen::ldm::MeVPrtlTruth::MeVPrtlTruth(const MeVPrtlFlux &flux,
66
double flux_weight, double ray_weight,
77
double decay_weight, double pot) :
88

9-
kaon_dmom(flux.kmom),
10-
kaon_dmom_beamcoord(flux.kmom_beamcoord),
11-
kaon_dpos_beamcoord(flux.pos_beamcoord),
12-
kaon_pdg(flux.kaon_pdg),
9+
meson_dmom(flux.mmom),
10+
meson_dmom_beamcoord(flux.mmom_beamcoord),
11+
meson_dpos_beamcoord(flux.pos_beamcoord),
12+
meson_pdg(flux.meson_pdg),
1313
mevprtl_mom_beamcoord(flux.mom_beamcoord),
1414
mevprtl_mom(flux.mom),
1515
mevprtl_start(flux.pos),
@@ -30,9 +30,10 @@ evgen::ldm::MeVPrtlTruth::MeVPrtlTruth(const MeVPrtlFlux &flux,
3030
C3(flux.C3),
3131
C4(flux.C4),
3232
C5(flux.C5),
33-
decay_width(decay.decay_width),
34-
mean_lifetime(decay.mean_lifetime),
35-
mean_distance(decay.mean_distance)
33+
total_decay_width(decay.total_decay_width),
34+
total_mean_lifetime(decay.total_mean_lifetime),
35+
total_mean_distance(decay.total_mean_distance),
36+
allowed_decay_fraction(decay.allowed_decay_fraction)
3637
{
3738
gen = (evgen::ldm::Generator)flux.generator;
3839
}

‎sbnobj/Common/EventGen/MeVPrtl/MeVPrtlTruth.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ namespace ldm {
1212
enum Generator {
1313
kUnknown=-1,
1414
kDissonantHiggs=0,
15-
kHNL=1
15+
kHNL=1,
16+
kALP=2
1617
};
1718

1819
class MeVPrtlTruth {
1920
public:
20-
TLorentzVector kaon_dmom;
21-
TLorentzVector kaon_dmom_beamcoord;
22-
TLorentzVector kaon_dpos_beamcoord;
23-
int kaon_pdg;
21+
TLorentzVector meson_dmom;
22+
TLorentzVector meson_dmom_beamcoord;
23+
TLorentzVector meson_dpos_beamcoord;
24+
int meson_pdg;
2425
TLorentzVector mevprtl_mom_beamcoord;
2526
TLorentzVector mevprtl_mom;
2627
TLorentzVector mevprtl_start;
@@ -48,9 +49,13 @@ class MeVPrtlTruth {
4849
double C4;
4950
double C5;
5051

51-
double decay_width;
52-
double mean_lifetime;
53-
double mean_distance;
52+
// Total widths / distances for all possible decays
53+
double total_decay_width;
54+
double total_mean_lifetime;
55+
double total_mean_distance;
56+
57+
// Fraction of width for allowed decays
58+
double allowed_decay_fraction;
5459

5560
Generator gen;
5661

sbnobj/Common/EventGen/MeVPrtl/KaonParent.cxx renamed to sbnobj/Common/EventGen/MeVPrtl/MesonParent.cxx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
#include "KaonParent.h"
1+
#include "MesonParent.h"
22
#include <cassert>
33

4-
evgen::ldm::KaonParent::KaonParent(const simb::MCFlux &flux) {
4+
evgen::ldm::MesonParent::MesonParent(const simb::MCFlux &flux) {
55
// set the particle codes
66
switch (flux.fndecay) {
7+
case -1 /* not a decay, use the ptype instead */:
8+
meson_pdg = flux.fptype;
9+
break;
710
case 1 /*K0L -> nue pi- e+ */:
811
case 2 /*K0L -> nuebar pi+ e-*/:
912
case 3 /* K0L -> numu pi- mu+*/:
1013
case 4 /*K0L -> numubar pi+ mu-*/:
11-
kaon_pdg = 130;
14+
meson_pdg = 130;
1215
break;
1316
case 5 /*K+ -> numu mu+*/:
1417
case 6 /*K+ -> nue pi0 e+*/:
1518
case 7 /*K+ -> numu pi0 mu+*/:
16-
kaon_pdg = 321;
19+
meson_pdg = 321;
1720
break;
1821
case 8 /*K- -> numubar mu-*/:
1922
case 9 /*K- -> nuebar pi0 e-*/:
2023
case 10 /*K- -> numubar pi0 mu-*/:
21-
kaon_pdg = -321;
24+
meson_pdg = -321;
2225
break;
2326
default:
24-
kaon_pdg = 0;
27+
meson_pdg = 0;
2528
return; // not a kaon decay
2629
}
2730
mode = flux.fndecay;

‎sbnobj/Common/EventGen/MeVPrtl/MesonParent.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#ifndef _MesonParent_HH_
2+
#define _MesonParent_HH_
3+
4+
#include "TLorentzVector.h"
5+
#include "nusimdata/SimulationBase/MCFlux.h"
6+
#include "TRotation.h"
7+
8+
namespace evgen {
9+
namespace ldm {
10+
class MesonParent {
11+
public:
12+
TLorentzVector pos;
13+
TLorentzVector mom;
14+
int meson_pdg;
15+
double weight;
16+
int mode;
17+
18+
MesonParent() {} // Default initialize
19+
MesonParent(const simb::MCFlux &flux);
20+
bool isKaon() const {return abs(meson_pdg) == 321 || meson_pdg == 130;}
21+
};
22+
23+
}
24+
}
25+
26+
#endif

‎sbnobj/Common/EventGen/MeVPrtl/classes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "sbnobj/Common/EventGen/MeVPrtl/MeVPrtlTruth.h"
33
#include "sbnobj/Common/EventGen/MeVPrtl/MeVPrtlDecay.h"
44
#include "sbnobj/Common/EventGen/MeVPrtl/MeVPrtlFlux.h"
5-
#include "sbnobj/Common/EventGen/MeVPrtl/KaonParent.h"
5+
#include "sbnobj/Common/EventGen/MeVPrtl/MesonParent.h"
66
#include <vector>
77
#include <utility>
88
#include "TLorentzVector.h"

‎sbnobj/Common/EventGen/MeVPrtl/classes_def.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<enum name="evgen::ldm::Generator" ClassVersion="10"/>
33
<class name="art::Wrapper<evgen::ldm::Generator>" />
44

5-
<class name="evgen::ldm::MeVPrtlTruth" ClassVersion="13" >
5+
<class name="evgen::ldm::MeVPrtlTruth" ClassVersion="15" >
6+
<version ClassVersion="15" checksum="4052252425"/>
7+
<version ClassVersion="14" checksum="2705813761"/>
68
<version ClassVersion="13" checksum="595941781"/>
79
<version ClassVersion="12" checksum="3242977751"/>
810
<version ClassVersion="11" checksum="2512756796"/>
@@ -12,7 +14,8 @@
1214
<class name="art::Wrapper<evgen::ldm::MeVPrtlTruth>" />
1315
<class name="art::Wrapper<std::vector<evgen::ldm::MeVPrtlTruth>>" />
1416

15-
<class name="evgen::ldm::MeVPrtlDecay" ClassVersion="12" >
17+
<class name="evgen::ldm::MeVPrtlDecay" ClassVersion="13" >
18+
<version ClassVersion="13" checksum="1778715002"/>
1619
<version ClassVersion="12" checksum="568285194"/>
1720
<version ClassVersion="11" checksum="4053925473"/>
1821
<version ClassVersion="10" checksum="1041718571"/>
@@ -21,7 +24,8 @@
2124
<class name="art::Wrapper<evgen::ldm::MeVPrtlDecay>" />
2225
<class name="art::Wrapper<std::vector<evgen::ldm::MeVPrtlDecay>>" />
2326

24-
<class name="evgen::ldm::MeVPrtlFlux" ClassVersion="12" >
27+
<class name="evgen::ldm::MeVPrtlFlux" ClassVersion="13" >
28+
<version ClassVersion="13" checksum="2581972823"/>
2529
<version ClassVersion="12" checksum="58715042"/>
2630
<version ClassVersion="11" checksum="2679592796"/>
2731
<version ClassVersion="10" checksum="2168957026"/>
@@ -30,10 +34,11 @@
3034
<class name="art::Wrapper<evgen::ldm::MeVPrtlFlux>" />
3135
<class name="art::Wrapper<std::vector<evgen::ldm::MeVPrtlFlux>>" />
3236

33-
<class name="evgen::ldm::KaonParent" ClassVersion="10" >
37+
<class name="evgen::ldm::MesonParent" ClassVersion="11" >
38+
<version ClassVersion="11" checksum="1463265797"/>
3439
<version ClassVersion="10" checksum="3560353853"/>
3540
</class>
36-
<class name="std::vector<evgen::ldm::KaonParent>" />
37-
<class name="art::Wrapper<evgen::ldm::KaonParent>" />
38-
<class name="art::Wrapper<std::vector<evgen::ldm::KaonParent>>" />
41+
<class name="std::vector<evgen::ldm::MesonParent>" />
42+
<class name="art::Wrapper<evgen::ldm::MesonParent>" />
43+
<class name="art::Wrapper<std::vector<evgen::ldm::MesonParent>>" />
3944
</lcgdict>

0 commit comments

Comments
 (0)