-
Notifications
You must be signed in to change notification settings - Fork 82
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.
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
Agnostic helix finder and correction of the charged pion lifetime #1210
Merged
Merged
Changes from all commits
Commits
Show all changes
79 commits
Select commit
Hold shift + click to select a range
340b866
filter based on the PID of the helix
NamithaChitrazee 23c68d3
Update prolog.fcl
NamithaChitrazee 4239a11
added average hit times for both readout sides of a CRV coincidence c…
ehrlich-uva 7c37ef7
fcl file for extracted position in EventDisplay
ehrlich-uva e18faa2
changes related to CRV coincidence finder: remove std::pairs, replace…
ehrlich-uva 787c321
bug fixes
ehrlich-uva 5561b6b
reconstruct CRV hit position based on readout times at both counter ends
ehrlich-uva 0699253
comment about fiberSignalSpeed
ehrlich-uva db36f13
Merge branch 'pbar2m' into pbar2m3
NamithaChitrazee 2c379aa
Merge pull request #11 from NamithaChitrazee/pbar2m3
NamithaChitrazee 393ec80
Fix config bug
brownd1978 945813e
putting in framework to filter out bad TCs for Ethan to work on
matthewstortini 69dfe24
fix charges pion lifetime
ae54f21
add more columns to 1-like-per object printout
0be99c5
extend generator_tool to return its process code
235da9d
fit charged pion lifetime
b953053
merging offline p051, fix tabs and whitespaces
bdb7ecc
fix indentation
gianipez 071f641
starting point for Hussein
e2f976a
bug fix
dc4a23a
fix compilation in prof mode
d98351f
Merge remote-tracking branch 'origin/main' into merge_051
a673c96
Merge branch 'main' into merge_051
NamithaChitrazee 5ee711e
small changes
0ebcd55
Merge branch 'pbar2m' into merge_051
NamithaChitrazee bec3987
Merge pull request #13 from NamithaChitrazee/merge_051
NamithaChitrazee 39a7a61
added the option to run filters without filtering
13b447c
update comments
a57ad67
generate pi+ --> enu
697c370
generate pi+ --> enu
5d924f2
Merge pull request #14 from NamithaChitrazee/merge_051
NamithaChitrazee 5afcf2a
adding HelixFinder to CalPatRec
matthewstortini 365bbc8
fixing format issues in fcl
matthewstortini 02062be
Add TZClusterSelection in TZClusterFinder
7467f3f
Removed the CosmicFilter module unused
d5015fa
removed the prolog_trigger
b49e324
Merge branch 'Mu2e:main' into pbar2m
NamithaChitrazee f9516b4
fixed the default value
gianipez 304fa7f
changing default fcl param
matthewstortini 802b0c5
added multiplicity option to filters
ethanmar 59277ed
Merge branch 'main' into pbar2m
pavel1murat c622f75
fixed param value
gianipez 5e53cc0
added the option to not check the z propagation direction
ethanmar 612500e
addressing PR comments
matthewstortini 1e5d479
fixing small error
matthewstortini b7a261b
fixing one missed comment from Dave
matthewstortini 52a86d7
fixing one missed comment from Dave again
matthewstortini bde3c55
Addressing the PR comments
NamithaChitrazee c3cbf76
Update HitData_t.hh
NamithaChitrazee a92287f
Merge branch 'main' into pbar2m
gianipez c5f656a
Remove EventGenerator/src/ParticleGunMu_tool.cc
NamithaChitrazee 86d06b7
Remove EventGenerator/src/EventGeneratorMu_module.cc
NamithaChitrazee ebc9f7a
Remove EventGenerator/src/StoppedPiENuGenerator_tool.cc
NamithaChitrazee 08fc1ae
addreass comments by Dave: remove commented out lines, hide CalPatRec…
3a42755
cleanup
673869c
Removed the PhiZSeedFinder module for the time being
40c45d5
Revert Event Generator changes
26b1b2b
Revert Event Generator changes
6cda914
small fix
NamithaChitrazee b926632
Revert of TZClusterFinder
143b331
as requested
4eb209a
one minor prolog change and aesthetic changes
matthewstortini 3978b11
Fix DeltaFinderAlg.hh and DeltaFinderAlg.cc, the parameter maximumTim…
c4b32e9
Add TZClusterFilter as independent module separated from TZClusterFinder
4ccb9b7
Add XYZVectorF to TZClusterFilter
6973850
save locally
53ca285
saving my local changes
9fd3069
catch invalid time range
6c47133
remove confusing proton
d5c2154
Merge branch 'main' into pbar2m
NamithaChitrazee 94b1775
remove files added by mistake
cc22fe1
revert some changes
492fca6
revert some changes 2
NamithaChitrazee cf56377
revert some changes 3
NamithaChitrazee 8897edf
revert some changes 4
NamithaChitrazee bf54ad6
revert some changes 5
NamithaChitrazee 7c6fc89
revert some changes 6
NamithaChitrazee a6be539
Merge remote-tracking branch 'mu2e/main' into pbar2m
gianipez d99670e
removed white spaces
gianipez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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,36 @@ | ||
#ifndef CalPatRec_AgnosticHelixFinder_types_hh | ||
#define CalPatRec_AgnosticHelixFinder_types_hh | ||
|
||
#include "fhiclcpp/types/Atom.h" | ||
|
||
namespace mu2e { | ||
|
||
namespace AgnosticHelixFinderTypes { | ||
|
||
struct Config { | ||
fhicl::Atom<std::string> tool_type{fhicl::Name("tool_type"), fhicl::Comment("tool type: AgnosticHelixFinderDiag")}; | ||
}; | ||
|
||
struct tcInfo { | ||
int nHelices; | ||
int nComboHits; | ||
int nStrawHits; | ||
float time; | ||
}; | ||
|
||
struct lineSegmentInfo { | ||
float chi2dof; | ||
float maxHitGap; | ||
}; | ||
|
||
struct diagInfo { | ||
float moduleTime; | ||
int nHelices; | ||
int nTimeClusters; | ||
std::vector<tcInfo> timeClusterData; | ||
std::vector<lineSegmentInfo> lineSegmentData; | ||
}; | ||
|
||
} // namespace AgnosticHelixFinderTypes | ||
} // namespace mu2e | ||
#endif |
4 changes: 2 additions & 2 deletions
4
CalPatRec/inc/DeltaFinder_enums.hh → CalPatRec/inc/CalPatRec_enums.hh
This file contains 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 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,19 @@ | ||
#ifndef __CalPatRec_inc_ChannelID_hh__ | ||
#define __CalPatRec_inc_ChannelID_hh__ | ||
|
||
namespace CalPatRec { | ||
struct ChannelID { | ||
int Station; | ||
int Plane; | ||
int Face; | ||
int Panel; | ||
|
||
static void orderID (ChannelID* X, ChannelID* Ordered); | ||
static void deOrderID(ChannelID* X, ChannelID* Ordered); | ||
|
||
static void testOrderID (); | ||
static void testdeOrderID(); | ||
}; | ||
} | ||
|
||
#endif |
This file contains 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 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 |
---|---|---|
|
@@ -43,15 +43,13 @@ namespace mu2e { | |
fhicl::Atom<int> mergePC {Name("mergePC" ), Comment("1: merge proton candidates" ) }; | ||
fhicl::Atom<int> pickupProtonHits {Name("pickupProtonHits" ), Comment("1: pickup single proton hits") }; | ||
fhicl::Atom<float> timeBin {Name("timeBin" ), Comment("time bin for storing hits" ) }; | ||
fhicl::Atom<float> minHitTime {Name("minHitTime" ), Comment("min hit time" ) }; | ||
fhicl::Atom<float> maxDeltaEDep {Name("maxDeltaEDep" ), Comment("max delta candidate eDep" ) }; | ||
fhicl::Atom<float> maxSeedEDep {Name("maxSeedEDep" ), Comment("max seed eDep" ) }; | ||
fhicl::Atom<float> minProtonSeedEDep {Name("minProtonSeedEDep" ), Comment("min proton seed eDep" ) }; | ||
fhicl::Atom<float> minProtonHitEDep {Name("minProtonHitEDep" ), Comment("min proton hit eDep" ) }; | ||
fhicl::Atom<int> minNSeeds {Name("minNSeeds" ), Comment("min N seeds in a delta cand" ) }; | ||
fhicl::Atom<int> minDeltaNHits {Name("minDeltaNHits" ), Comment("min N combo hits in a delta") }; | ||
fhicl::Atom<float> maxEleHitEnergy {Name("maxEleHitEnergy" ), Comment("max electron hit energy" ) }; | ||
fhicl::Atom<float> minimumTime {Name("minimumTime" ), Comment("minimum time" ) }; | ||
fhicl::Atom<float> maximumTime {Name("maximumTime" ), Comment("maximum time" ) }; | ||
fhicl::Atom<float> maxHitSeedDt {Name("maxHitSeedDt" ), Comment("max DT(hit-seed)" ) }; | ||
fhicl::Atom<float> maxChi2Seed {Name("maxChi2Seed" ), Comment("max seed chi2 (stereo)" ) }; | ||
|
@@ -92,7 +90,7 @@ namespace mu2e { | |
int _minNSeeds; // min number of seeds in the delta electron cluster | ||
int _minDeltaNHits; // min number of hits of a delta candidate | ||
float _maxEleHitEnergy; // | ||
float _minT; | ||
// float _minT; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove commented lines |
||
float _maxT; | ||
float _maxHitSeedDt; // | ||
float _maxChi2Seed; // | ||
|
This file contains 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
Oops, something went wrong.
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.
Why do we need this structure? Its content is identical to StrawId, and all of the functionality ( station, plane, face, panel) is available through accessor functions in StrawId. Having multiple structures represent ingthe same data is confusing and exposes the code to errors.
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.
this is an internal for the algorithm helper class which returns hit indices ordered in Z. This functionality is not provided by the StrawId class.
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.
what functionality is not provided by StrawId?
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.
at the time when the code has been developed, the StrawId interface was not providing an ordering of the faces in assending global Z. As you already mentioned, it might be a good idea to integrate this functionality into the StrawId class
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.
I will start an issue and assign it for resolution after this PR