Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event builder v2 tools #307

Open
wants to merge 5 commits into
base: Application
Choose a base branch
from
Open

Event builder v2 tools #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e3c7d8
Add files via upload
fengyvoid Oct 11, 2024
ce2334e
Revert "Add files via upload"
fengyvoid Oct 11, 2024
4119f18
EventBuilderV2 tools
fengyvoid Oct 11, 2024
17566d2
ANNIEEventTreeMaker
fengyvoid Oct 11, 2024
97428b8
Modify LAPPDHit and LAPPDPulse in datamodel
fengyvoid Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 115 additions & 61 deletions DataModel/LAPPDHit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,100 +2,154 @@
#ifndef LAPPDHITCLASS_H
#define LAPPDHITCLASS_H

#include<Hit.h>
#include<SerialisableObject.h>
#include <Hit.h>
#include "LAPPDPulse.h"
#include <SerialisableObject.h>

using std::cout;
using std::endl;

class LAPPDHit : public Hit{

class LAPPDHit : public Hit
{

friend class boost::serialization::access;

public:
LAPPDHit() : Hit(), Position(0), LocalPosition(0) {serialise=true;}
LAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition) : Hit(thetubeid,thetime,thecharge), Position(theposition), LocalPosition(thelocalposition) {serialise=true;}

public:
LAPPDHit() : Hit(), Position(0), LocalPosition(0) { serialise = true; }
LAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition) : Hit(thetubeid, thetime, thecharge), Position(theposition), LocalPosition(thelocalposition) { serialise = true; }
LAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition, double pulse1LastTime, double pulse2LastTime, double pulse1StartTime, double pulse2StartTime) : Hit(thetubeid, thetime, thecharge), Position(theposition), LocalPosition(thelocalposition)
{
serialise = true;
Pulse1LastTime = pulse1LastTime;
Pulse2LastTime = pulse2LastTime;
Pulse1StartTime = pulse1StartTime;
Pulse2StartTime = pulse2StartTime;
}
LAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition, double pulse1LastTime, double pulse2LastTime, double pulse1StartTime, double pulse2StartTime, LAPPDPulse p1, LAPPDPulse p2) : Hit(thetubeid, thetime, thecharge), Position(theposition), LocalPosition(thelocalposition)
{
serialise = true;
Pulse1LastTime = pulse1LastTime;
Pulse2LastTime = pulse2LastTime;
Pulse1StartTime = pulse1StartTime;
Pulse2StartTime = pulse2StartTime;
pulse1 = p1;
pulse2 = p2;
}

virtual ~LAPPDHit(){};

inline std::vector<double> GetPosition() const {return Position;}
inline std::vector<double> GetLocalPosition() const {return LocalPosition;}
inline void SetPosition(std::vector<double> pos){Position=pos;}
inline void SetLocalPosition(std::vector<double> locpos){LocalPosition=locpos;}

bool Print() {
cout<<"TubeId : "<<TubeId<<endl;
cout<<"Time : "<<Time<<endl;
cout<<"X Pos : "<<Position.at(0)<<endl;
cout<<"Y Pos : "<<Position.at(1)<<endl;
cout<<"Z Pos : "<<Position.at(2)<<endl;
cout<<"Parallel Pos : "<<LocalPosition.at(0)<<endl;
cout<<"Transverse Pos : "<<LocalPosition.at(1)<<endl;
cout<<"Charge : "<<Charge<<endl;

inline std::vector<double> GetPosition() const { return Position; }
inline std::vector<double> GetLocalPosition() const { return LocalPosition; }
inline void SetPosition(std::vector<double> pos) { Position = pos; }
inline void SetLocalPosition(std::vector<double> locpos) { LocalPosition = locpos; }
inline double GetPulse1LastTime() const { return Pulse1LastTime; }
inline double GetPulse2LastTime() const { return Pulse2LastTime; }
inline double GetPulse1StartTime() const { return Pulse1StartTime; }
inline double GetPulse2StartTime() const { return Pulse2StartTime; }
inline LAPPDPulse GetPulse1() const { return pulse1; }
inline LAPPDPulse GetPulse2() const { return pulse2; }

bool Print()
{
cout << "TubeId : " << TubeId << endl;
cout << "Time : " << Time << endl;
cout << "X Pos : " << Position.at(0) << endl;
cout << "Y Pos : " << Position.at(1) << endl;
cout << "Z Pos : " << Position.at(2) << endl;
cout << "Parallel Pos : " << LocalPosition.at(0) << endl;
cout << "Transverse Pos : " << LocalPosition.at(1) << endl;
cout << "Charge : " << Charge << endl;
return true;
}
protected:

protected:
std::vector<double> Position;
std::vector<double> LocalPosition;

template<class Archive> void serialize(Archive & ar, const unsigned int version){
if(serialise){
double Pulse1LastTime;
double Pulse2LastTime;
double Pulse1StartTime;
double Pulse2StartTime;
LAPPDPulse pulse1;
LAPPDPulse pulse2;

template <class Archive>
void serialize(Archive &ar, const unsigned int version)
{
if (serialise)
{
ar & TubeId;
ar & Time;
ar & Position;
ar & LocalPosition;
ar & Charge;

ar & Pulse1LastTime;
ar & Pulse2LastTime;
ar & Pulse1StartTime;
ar & Pulse2StartTime;
ar & pulse1;
ar & pulse2;
}
}
};

// Derived classes
class MCLAPPDHit : public LAPPDHit{

class MCLAPPDHit : public LAPPDHit
{

friend class boost::serialization::access;

public:
MCLAPPDHit() : LAPPDHit(), Parents(std::vector<int>{}) {serialise=true;}
MCLAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition, std::vector<int> theparents) : LAPPDHit(thetubeid, thetime, thecharge,theposition,thelocalposition), Parents(theparents) {serialise=true;}

const std::vector<int>* GetParents() const { return &Parents; }
void SetParents(std::vector<int> parentsin){ Parents = parentsin; }

bool Print() {
cout<<"TubeId : "<<TubeId<<endl;
cout<<"Time : "<<Time<<endl;
cout<<"X Pos : "<<Position.at(0)<<endl;
cout<<"Y Pos : "<<Position.at(1)<<endl;
cout<<"Z Pos : "<<Position.at(2)<<endl;
cout<<"Parallel Pos : "<<LocalPosition.at(0)<<endl;
cout<<"Transverse Pos : "<<LocalPosition.at(1)<<endl;
cout<<"Charge : "<<Charge<<endl;
if(Parents.size()){
cout<<"Parent MCPartice indices: {";
for(int parenti=0; parenti<(int)Parents.size(); ++parenti){
cout<<Parents.at(parenti);
if((parenti+1)<(int)Parents.size()) cout<<", ";

public:
MCLAPPDHit() : LAPPDHit(), Parents(std::vector<int>{}) { serialise = true; }
MCLAPPDHit(int thetubeid, double thetime, double thecharge, std::vector<double> theposition, std::vector<double> thelocalposition, std::vector<int> theparents) : LAPPDHit(thetubeid, thetime, thecharge, theposition, thelocalposition), Parents(theparents) { serialise = true; }

const std::vector<int> *GetParents() const { return &Parents; }
void SetParents(std::vector<int> parentsin) { Parents = parentsin; }

bool Print()
{
cout << "TubeId : " << TubeId << endl;
cout << "Time : " << Time << endl;
cout << "X Pos : " << Position.at(0) << endl;
cout << "Y Pos : " << Position.at(1) << endl;
cout << "Z Pos : " << Position.at(2) << endl;
cout << "Parallel Pos : " << LocalPosition.at(0) << endl;
cout << "Transverse Pos : " << LocalPosition.at(1) << endl;
cout << "Charge : " << Charge << endl;
if (Parents.size())
{
cout << "Parent MCPartice indices: {";
for (int parenti = 0; parenti < (int)Parents.size(); ++parenti)
{
cout << Parents.at(parenti);
if ((parenti + 1) < (int)Parents.size())
cout << ", ";
}
cout<<"}"<<endl;
} else {
cout<<"No recorded parents"<<endl;
cout << "}" << endl;
}
else
{
cout << "No recorded parents" << endl;
}
return true;
}

template<class Archive> void serialize(Archive & ar, const unsigned int version){
if(serialise){

template <class Archive>
void serialize(Archive &ar, const unsigned int version)
{
if (serialise)
{
ar & TubeId;
ar & Time;
ar & Position;
ar & LocalPosition;
ar & Charge;
// n.b. at time of writing MCHit stores no additional persistent members
// - it only adds parent MCParticle indices, and these aren't saved...
// - it only adds parent MCParticle indices, and these aren't saved...
}
}
protected:

protected:
std::vector<int> Parents;
};

Expand Down
15 changes: 15 additions & 0 deletions DataModel/LAPPDPulse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,20 @@ class LAPPDPulse : public Hit{
inline void SetChannelID(int channelid){ChannelID=channelid;}
inline void SetPeak(double peak){Peak=peak;}
inline void SetRange(double low, double hi){LowRange=low; HiRange=hi;}
inline void SetHalfHeightTime(double half){halfHeightTime=half;}
inline double GetHalfHeightTime(){return halfHeightTime;}
inline void SetHalfEndTime(double half){halfEndTime=half;}
inline double GetHalfEndTime(){return halfEndTime;}
inline void SetBaseline(double base){baseline=base;}
inline double GetBaseline(){return baseline;}

bool Print() {
cout<<"TubeId : "<<TubeId<<endl;
cout<<"ChannelID : "<<ChannelID<<endl;
cout<<"Time : "<<Time<<endl;
cout<<"Charge : "<<Charge<<endl;
cout<<"HalfHeightTime : "<<halfHeightTime<<endl;
cout<<"Baseline : "<<baseline<<endl;
return true;
}

Expand All @@ -36,6 +44,10 @@ class LAPPDPulse : public Hit{
double Peak;
double LowRange;
double HiRange;
double halfHeightTime;
double halfEndTime;
double baseline;



template<class Archive> void serialize(Archive & ar, const unsigned int version){
Expand All @@ -47,6 +59,9 @@ class LAPPDPulse : public Hit{
ar & Peak;
ar & LowRange;
ar & HiRange;
ar & halfHeightTime;
ar & halfEndTime;
ar & baseline;
}
}
};
Expand Down
Loading
Loading