Feature/adding blip to caf #603
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
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
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,104 @@ | ||||||||||||||||||||||||||||||
| #include "sbncode/CAFMaker/FillBlip.h" | ||||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Thanks for putting in a separate file, FillReco is getting unwieldy. |
||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| namespace caf | ||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||
| void FillBlip( const std::vector<blip::Blip>& LarBlips, std::vector<caf::SRBlip>& CAF_Blips) | ||||||||||||||||||||||||||||||
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||
| int NBlips = LarBlips.size(); | ||||||||||||||||||||||||||||||
| for(int iBlip=0; iBlip<NBlips; iBlip++) | ||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||
| blip::Blip CurrentBlip = LarBlips[iBlip]; | ||||||||||||||||||||||||||||||
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||||||||||||||||||||||
| caf::SRBlip NewBlip; | ||||||||||||||||||||||||||||||
| NewBlip.ID = CurrentBlip.ID; | ||||||||||||||||||||||||||||||
| NewBlip.isValid = CurrentBlip.isValid; | ||||||||||||||||||||||||||||||
| NewBlip.Cryostat = CurrentBlip.Cryostat; | ||||||||||||||||||||||||||||||
| NewBlip.TPC = CurrentBlip.TPC; | ||||||||||||||||||||||||||||||
| NewBlip.NPlanes = CurrentBlip.NPlanes; | ||||||||||||||||||||||||||||||
| NewBlip.MaxWireSpan = CurrentBlip.MaxWireSpan; | ||||||||||||||||||||||||||||||
| NewBlip.TimeTick = CurrentBlip.TimeTick; | ||||||||||||||||||||||||||||||
| NewBlip.Time = CurrentBlip.Time; | ||||||||||||||||||||||||||||||
| NewBlip.Charge = CurrentBlip.Charge; | ||||||||||||||||||||||||||||||
| NewBlip.Energy = CurrentBlip.Energy/1000.; //convert to GeV | ||||||||||||||||||||||||||||||
| NewBlip.EnergyESTAR = CurrentBlip.EnergyESTAR/1000.; //convert to GeV | ||||||||||||||||||||||||||||||
| NewBlip.EnergyPSTAR = CurrentBlip.EnergyPSTAR/1000.; //convert to GeV | ||||||||||||||||||||||||||||||
| NewBlip.ProxTrkDist = CurrentBlip.ProxTrkDist; | ||||||||||||||||||||||||||||||
| NewBlip.ProxTrkID = CurrentBlip.ProxTrkID; | ||||||||||||||||||||||||||||||
| NewBlip.inCylinder = CurrentBlip.inCylinder; | ||||||||||||||||||||||||||||||
| NewBlip.Position = CurrentBlip.Position; | ||||||||||||||||||||||||||||||
| NewBlip.SigmaYZ = CurrentBlip.SigmaYZ; | ||||||||||||||||||||||||||||||
| NewBlip.dX = CurrentBlip.dX; | ||||||||||||||||||||||||||||||
| NewBlip.dYZ = CurrentBlip.dYZ; | ||||||||||||||||||||||||||||||
| if(CurrentBlip.truth.ID >= 0 ) //MC Blip | ||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||
| FillMCTruthBlip( CurrentBlip, NewBlip ); | ||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||
| FillBlipRealtedHitCluster( CurrentBlip, NewBlip ); | ||||||||||||||||||||||||||||||
| CAF_Blips.push_back(NewBlip); | ||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| void FillMCTruthBlip( blip::Blip& LarBlip, caf::SRBlip &CAF_Blip ) | ||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||
| void FillMCTruthBlip( blip::Blip& LarBlip, caf::SRBlip &CAF_Blip ) | |
| void FillMCTruthBlip( blip::Blip const& LarBlip, caf::SRBlip &CAF_Blip ) |
Also, since the function is dealing only with LarBlip.truth and CAF_Blip.truthBlip, the arguments should be these two rather than LarBlip and CAF_Blip.
Same argument name comment as above, too.
Contributor
Author
There was a problem hiding this comment.
Updated this and hitCluster functions
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
Outdated
Member
There was a problem hiding this comment.
I recommend to use the appropriate std::vector member function, assign():
Suggested change
| //These are sets that need to become vectors so we need to do some loops | |
| for(auto HitID : LarBlip.clusters[iPlane].HitIDs) CAF_Blip.clusters[iPlane].HitIDs.push_back(HitID); | |
| // These are sets that need to become vectors | |
| CAF_Blip.clusters[iPlane].HitIDs.assign(begin(LarBlip.clusters[iPlane].HitIDs), end(LarBlip.clusters[iPlane].HitIDs)); |
If this function is changed as recommended above to work on a single cluster, this becomes less wordy and more readable:
Suggested change
| //These are sets that need to become vectors so we need to do some loops | |
| for(auto HitID : LarBlip.clusters[iPlane].HitIDs) CAF_Blip.clusters[iPlane].HitIDs.push_back(HitID); | |
| // These are sets that need to become vectors | |
| CAFcluster.HitIDs.assign(begin(LArCluster.HitIDs), end(LArCluster.HitIDs)); |
same for the next three lines; in fact, you could even write a specific function and use it repeatedly:
Suggested change
| //These are sets that need to become vectors so we need to do some loops | |
| for(auto HitID : LarBlip.clusters[iPlane].HitIDs) CAF_Blip.clusters[iPlane].HitIDs.push_back(HitID); | |
| // These are sets that need to become vectors | |
| auto copyToVector = [](auto& dest, auto const& src) | |
| { dest.assign(begin(src), end(src)); }; | |
| copyToVector(CAF_Blip.clusters[iPlane].HitIDs, LarBlip.clusters[iPlane].HitIDs); |
etc.
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,17 @@ | ||
| #ifndef CAF_FILLBLIP_H | ||
PetrilloAtWork marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #define CAF_FILLBLIP_H | ||
| #include<iostream> | ||
PetrilloAtWork marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| #include "sbnanaobj/StandardRecord/SRBlip.h" | ||
| #include "sbnobj/SBND/Blip/BlipDataTypes.h" | ||
|
|
||
| #include <vector> | ||
|
|
||
| namespace caf | ||
| { | ||
|
|
||
| void FillBlip( const std::vector<blip::Blip>& LarBlips, std::vector<caf::SRBlip>& CAF_Blips); | ||
| void FillMCTruthBlip(blip::Blip& LarBlip, caf::SRBlip& CAF_Blip ); | ||
| void FillBlipRealtedHitCluster(blip::Blip& LarBlip, caf::SRBlip& CAF_Blip); | ||
|
||
| } | ||
|
|
||
| #endif | ||
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.
Uh oh!
There was an error while loading. Please reload this page.