Feature/adding blip to caf #173
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| //////////////////////////////////////////////////////////////////////// | ||
| // \file SRBlip.cxx | ||
| // \brief SRBlip object for localized energy deposits in bulk LAr | ||
| // \author $Author: jmclaughlin2@illinoistech.edu | ||
| //////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #include "sbnanaobj/StandardRecord/SRBlip.h" | ||
|
|
||
|
|
||
| namespace caf | ||
| { | ||
| SRBlip::SRBlip() | ||
| { | ||
| ID = -9; // Blip ID / index | ||
|
Member
There was a problem hiding this comment. @PetrilloAtWork and @JosiePaton can comment but I believe there are some pre-defined defaults in CAF-land? Plus I believe -5 is often used as long as it is unphysical.
Contributor
Author
There was a problem hiding this comment. Updated most values to -5. For time of blips/hits -5 is a physical value, so I left it at -999. For the time tick I think index 0 is time 0, but I am not sure so I left that at -999 as well. |
||
| isValid = false; // Blip passes basic checks | ||
| Cryostat = -9; // Cryostat | ||
| TPC = -9; // TPC | ||
| NPlanes = -9; // Num. matched planes | ||
| MaxWireSpan = -9; // Maximum span of wires on any plane cluster | ||
| TimeTick = -999; // Readout time [ticks] | ||
| Time = -999; // Drift time [us] | ||
| Charge = -9; // Charge on calorimetry plane (electrons) | ||
| Energy = -999; // Energy (const dE/dx, fcl-configurable) | ||
| EnergyESTAR = -999; // Energy (ESTAR method from ArgoNeuT) | ||
| EnergyPSTAR = -999; // Energy (PSTAR method similar with ESTAR method from ArgoNeuT) | ||
| ProxTrkDist = -9; // Distance to cloest track | ||
| ProxTrkID = -9; // ID of closest track | ||
| inCylinder = false; // Is it in a cone/cylinder region? | ||
| Position.SetX(-999); //3d X Position [cm] | ||
| Position.SetY(-999); //3d Y Position [cm] | ||
| Position.SetZ(-999); //3d Z Position [cm] | ||
| SigmaYZ = -9.; // Uncertainty in YZ intersect [cm] | ||
| dX = -9; // Equivalent length along drift direction [cm] | ||
| dYZ = -9; // Approximate length scale in YZ space [cm] | ||
| } | ||
| SRBlip::~SRBlip() | ||
| { | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,44 @@ | ||||||||||||
| //////////////////////////////////////////////////////////////////////// | ||||||||||||
| // \file SRBlip.h | ||||||||||||
| // \brief SRBlip object for localized energy deposits in bulk LAr | ||||||||||||
| // \author $Author: jmclaughlin2@illinoistech.edu | ||||||||||||
| //////////////////////////////////////////////////////////////////////// | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||||||||||||
| #ifndef SRBLIP_H | ||||||||||||
| #define SRBLIP_H | ||||||||||||
| #include "sbnanaobj/StandardRecord/SRVector3D.h" | ||||||||||||
| #include "sbnanaobj/StandardRecord/SRBlipHitClust.h" | ||||||||||||
| #include "sbnanaobj/StandardRecord/SRBlipTrueBlip.h" | ||||||||||||
| #include "sbnanaobj/StandardRecord/SRCVNScore.h" | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||||||||||||
|
|
||||||||||||
| namespace caf | ||||||||||||
| { | ||||||||||||
| const int kNplanes = 3; | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||||||||||||
| class SRBlip | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||||||||||||
| { | ||||||||||||
| public: | ||||||||||||
|
Member
There was a problem hiding this comment. All data members are public, so I recommend this to be declared a
Suggested change
(no need for
Contributor
Author
There was a problem hiding this comment. We have some plans to add sorted score information for blip flash matching in the future, so I would like this to remain a class in anticipation of that future work being done
Member
There was a problem hiding this comment. Hmm... that means that the scores would be the only private members, and you would need a specific accessor only for that. That makes the data members asymmetric. Alternatively, you'd have to set all data private and provide one accessor per data member, which is tedious. |
||||||||||||
| SRBlip(); | ||||||||||||
| virtual ~SRBlip(); | ||||||||||||
|
Member
There was a problem hiding this comment. Please reshape the class so that:
After all this, the
Contributor
Author
There was a problem hiding this comment.
Right now the .cxx just assigns the position values. I don't know how to avoid that. |
||||||||||||
| int ID = -9; // Blip ID / index | ||||||||||||
| bool isValid = false; // Blip passes basic checks | ||||||||||||
| int Cryostat = -9; // Cryostat | ||||||||||||
| int TPC = -9; // TPC | ||||||||||||
| int NPlanes = -9; // Num. matched planes | ||||||||||||
| int MaxWireSpan = -9; // Maximum span of wires on any plane cluster | ||||||||||||
| float TimeTick = -999; // Readout time [ticks] | ||||||||||||
| float Time = -999; // Drift time [us] | ||||||||||||
| float Charge = -9; // Charge on calorimetry plane | ||||||||||||
| float Energy = -999; // Energy (const dE/dx, fcl-configurable) [GeV] | ||||||||||||
| float EnergyESTAR = -999; // Energy (ESTAR method from ArgoNeuT) [GeV] | ||||||||||||
| float EnergyPSTAR = -999; // Energy (PSTAR method similar with ESTAR method from ArgoNeuT) [GeV] | ||||||||||||
| float ProxTrkDist = -9; // Distance to cloest track | ||||||||||||
| int ProxTrkID = -9; // ID of closest track | ||||||||||||
| bool inCylinder = false; // Is it in a cone/cylinder region? | ||||||||||||
| SRVector3D Position; // 3D position TVector3 | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||||||||||||
| float SigmaYZ = -9.; // Uncertainty in YZ intersect [cm] | ||||||||||||
| float dX = -9; // Equivalent length along drift direction [cm] | ||||||||||||
| float dYZ = -9; // Approximate length scale in YZ space [cm] | ||||||||||||
| SRBlipHitClust clusters[kNplanes]; // Plane/cluster-specific information | ||||||||||||
| SRBlipTrueBlip truthBlip; // Truth-matched energy deposition | ||||||||||||
|
Member
There was a problem hiding this comment. Defaults are set in the constructor, can remove them from here.
Contributor
Author
There was a problem hiding this comment. For blips I removed these from here. The others are just structs so I kept the values in the header file. |
||||||||||||
| }; | ||||||||||||
| } | ||||||||||||
| #endif | ||||||||||||
|
PetrilloAtWork marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| //////////////////////////////////////////////////////////////////////// | ||
| // \file SRBlipHitClust.h | ||
| // \brief SRBlipHitClust struct contains information on hit clusters on each plane used to form a SRBlip | ||
| // \author $Author: jmclaughlin2@illinoistech.edu | ||
| //////////////////////////////////////////////////////////////////////// | ||
| #ifndef SBNANAOBJ_STANDARDRECORD_SRBLIPHITCLUST_H | ||
| #define SBNANAOBJ_STANDARDRECORD_SRBLIPHITCLUST_H | ||
| #include <map> | ||
| #include <set> | ||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||
| #include "sbnanaobj/StandardRecord/SRVector3D.h" | ||
|
|
||
| namespace caf | ||
| { | ||
| struct SRBlipHitClust { | ||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||
| int ID = -9; | ||
| bool isValid = false; | ||
| int CenterChan = -999; | ||
| int CenterWire = -999; | ||
| bool isTruthMatched = false; | ||
| bool isMerged = false; | ||
| bool isMatched = false; | ||
| int DeadWireSep = 99; | ||
| int Cryostat = -9; | ||
| int TPC = -9; | ||
| int Plane = -9; | ||
| int NHits = -9; | ||
| int NWires = -9; | ||
| float ADCs = -999; | ||
| float Amplitude = -999; | ||
| float Charge = -999; | ||
| float SigmaCharge = -999; | ||
| float TimeTick = -999; | ||
| float Time = -999; | ||
| float StartHitTime = -999; | ||
| float EndHitTime = -999; | ||
| float StartTime = -999; | ||
| float EndTime = -999; | ||
| float Timespan = -999; | ||
| float RMS = -999; | ||
| int StartWire = -999; | ||
| int EndWire = -999; | ||
| int NPulseTrainHits = -9; | ||
| float GoodnessOfFit = -999; | ||
| int BlipID = -9; | ||
| int EdepID = -9; | ||
| std::vector<int> HitIDs; | ||
| std::vector<int> Wires; | ||
| std::vector<int> Chans; | ||
| std::vector<int> G4IDs; | ||
| //std::map<int,SRVector3D> IntersectLocations; //intermediate step used for matching | ||
| }; | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| //////////////////////////////////////////////////////////////////////// | ||
| // \file SRBlipTrueBlip.h | ||
| // \brief SRBlipTrueBlip struct for localized energy deposits in bulk LAr. MC Truth information | ||
| // \author $Author: jmclaughlin2@illinoistech.edu | ||
| //////////////////////////////////////////////////////////////////////// | ||
| #ifndef SBNANAOBJ_STANDARDRECORD_SRBLIPTRUEBLIP_H | ||
| #define SBNANAOBJ_STANDARDRECORD_SRBLIPTRUEBLIP_H | ||
| #include "sbnanaobj/StandardRecord/SRVector3D.h" | ||
|
|
||
| namespace caf | ||
| { | ||
|
|
||
| struct SRBlipTrueBlip { | ||
|
PetrilloAtWork marked this conversation as resolved.
Outdated
|
||
| int ID = -9; // unique blip ID | ||
| int Cryostat = -9; // Cryostat ID | ||
| int TPC = -9; // TPC ID | ||
| float Time = -9; // time of particle interaction | ||
| int TimeTick = -9; // time tick | ||
| float DriftTime = -9; // drift time [us] | ||
| float Energy = 0; // energy dep [GeV] | ||
| int DepElectrons = 0; // deposited electrons | ||
| int NumElectrons = 0; // electrons reaching wires | ||
| int LeadG4ID = -9; // lead G4 track ID | ||
| int LeadG4Index = -9; // lead G4 track index | ||
| int LeadG4PDG = -9; // lead G4 PDG | ||
| float LeadCharge = -9; // lead G4 charge dep | ||
| SRVector3D Position; // XYZ position | ||
| //std::map<int,float> G4ChargeMap; //intermediate processing step not needed for CAF | ||
| //std::map<int,float> G4PDGMap; | ||
| }; | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,10 @@ | |
| <!-- art::Wrappers for these products are defined in CAFMaker --> | ||
|
|
||
| <lcgdict> | ||
| <class name="caf::StandardRecord" ClassVersion="17"> | ||
| <version ClassVersion="17" checksum="1651571235"/> | ||
| <version ClassVersion="16" checksum="3738947418"/> | ||
| <version ClassVersion="15" checksum="2636549707"/> | ||
|
Member
There was a problem hiding this comment. Only need to retain the most recent checksum and set it to version 15
Contributor
Author
There was a problem hiding this comment. Updated to reflect this change
Contributor
Author
There was a problem hiding this comment. Surprisingly the changes to default values don't seem to impact the checksum? |
||
| <version ClassVersion="14" checksum="1860171062"/> | ||
| <version ClassVersion="13" checksum="1979816256"/> | ||
| <version ClassVersion="12" checksum="3984422068"/> | ||
|
|
@@ -320,8 +322,21 @@ | |
| <version ClassVersion="10" checksum="4159815756"/> | ||
| </class> | ||
|
|
||
| <class name="caf::SRBlip" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="3364148027"/> | ||
| </class> | ||
|
|
||
| <class name="caf::SRBlipHitClust" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="1233871129"/> | ||
| </class> | ||
|
|
||
| <class name="caf::SRBlipTrueBlip" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="984259034"/> | ||
| </class> | ||
|
|
||
| <!--<class name="caf::SRLorentzVector" /> --> | ||
|
|
||
| <class name="std::vector<int>" /> | ||
| <class name="std::vector<caf::SRSlice>" /> | ||
| <class name="std::vector<caf::SRFakeReco>" /> | ||
| <class name="std::vector<caf::SRFakeRecoParticle>" /> | ||
|
|
@@ -350,6 +365,9 @@ | |
| <class name="std::vector<caf::SRTrigger>" /> | ||
| <class name="std::vector<caf::SRPFP>" /> | ||
| <class name="std::vector<caf::SRCVNScore>" /> | ||
| <class name="std::vector<caf::SRBlip>" /> | ||
| <class name="std::vector<caf::SRBlipHitClust>" /> | ||
| <class name="std::vector<caf::SRBlipTrueBlip>" /> | ||
|
|
||
| <class name="caf::SRCRTHitTruth" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="3618232749"/> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Convert this header into Doxygen format.
(the full name would be also nice to add in the
@authorline, if you are ok with that)