Skip to content

Feature/acastill lightpropagationfixes #834

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

Merged
nathanielerowe merged 10 commits into from
Nov 14, 2025
Merged

Feature/acastill lightpropagationfixes #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1acf969
Update analyzer
asanchezcastillo Sep 26, 2025
6bbf49d
Update attributed
asanchezcastillo Sep 26, 2025
c1d8892
Fix pfp ordering when using SCE products
asanchezcastillo Sep 26, 2025
4dc5019
Add flash attributes and initialize flash geo
asanchezcastillo Sep 29, 2025
5c11b2f
Merge branch 'develop' into feature/acastill_lightpropagationfixes
nathanielerowe Oct 21, 2025
e3bfdc6
Merge branch 'develop' into feature/acastill_lightpropagationfixes
nathanielerowe Nov 10, 2025
57ccdd2
Merge branch 'develop' into feature/acastill_lightpropagationfixes
nathanielerowe Nov 10, 2025
d3fc36c
update sbncode dep for CI
kjplows Nov 12, 2025
9db4edf
Merge branch 'develop' into feature/acastill_lightpropagationfixes
nathanielerowe Nov 13, 2025
c0f39c1
Merge branch 'develop' into feature/acastill_lightpropagationfixes
nathanielerowe Nov 14, 2025
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
30 changes: 15 additions & 15 deletions sbndcode/LightPropagationCorrection/LightPropagationCorrectionAna_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class LightPropagationCorrectionAna : public art::EDAnalyzer {
TTree* fTree; ///< The TTree for storing event information

double fOpFlashT0;
double fUpstreamTime_lightonly;
double fUpstreamTime_tpczcorr;
double fUpstreamTime_propcorr_tpczcorr;
double fNuToFLight;
double fNuToFCharge;
double fOpFlashT0Corrected;

unsigned int _eventID;
unsigned int _runID;
Expand All @@ -73,9 +73,9 @@ LightPropagationCorrectionAna::LightPropagationCorrectionAna(fhicl::ParameterSet
void LightPropagationCorrectionAna::analyze(art::Event const& e)
{
fOpFlashT0=-99999.;
fUpstreamTime_lightonly=-99999.;
fUpstreamTime_tpczcorr=-99999.;
fUpstreamTime_propcorr_tpczcorr=-99999.;
fNuToFLight=-99999.;
fNuToFCharge=-99999.;
fOpFlashT0Corrected=-99999.;

_eventID = -1;
_runID = -1;
Expand Down Expand Up @@ -118,14 +118,14 @@ void LightPropagationCorrectionAna::analyze(art::Event const& e)

std::cout << " Corrected flash time is " << correctedopflash->OpFlashT0 << std::endl;
std::cout << " Associated with slice id " << slice_v[0]->ID() << std::endl;
std::cout << "Corrected flash time light only " << correctedopflash->UpstreamTime_lightonly << std::endl;
std::cout << "Corrected flash time tpc z corr " << correctedopflash->UpstreamTime_tpczcorr << std::endl;
std::cout << "Corrected flash time prop corr tpc z corr " << correctedopflash->UpstreamTime_propcorr_tpczcorr << std::endl;
std::cout << "Corrected flash time light only " << correctedopflash->NuToFLight << std::endl;
std::cout << "Corrected flash time tpc z corr " << correctedopflash->NuToFCharge << std::endl;
std::cout << "Corrected flash time prop corr tpc z corr " << correctedopflash->OpFlashT0Corrected << std::endl;

fOpFlashT0 = correctedopflash->OpFlashT0;
fUpstreamTime_lightonly = correctedopflash->UpstreamTime_lightonly;
fUpstreamTime_tpczcorr = correctedopflash->UpstreamTime_tpczcorr;
fUpstreamTime_propcorr_tpczcorr = correctedopflash->UpstreamTime_propcorr_tpczcorr;
fNuToFLight = correctedopflash->NuToFLight;
fNuToFCharge = correctedopflash->NuToFCharge;
fOpFlashT0Corrected = correctedopflash->OpFlashT0Corrected;
fTree->Fill();
}
}
Expand All @@ -141,9 +141,9 @@ void LightPropagationCorrectionAna::beginJob()
fTree->Branch("subrunID", &_subrunID, "subrunID/i");

fTree->Branch("fOpFlashT0", &fOpFlashT0, "OpFlashT0/d");
fTree->Branch("fUpstreamTime_lightonly", &fUpstreamTime_lightonly, "UpstreamTime_lightonly/d");
fTree->Branch("fUpstreamTime_tpczcorr", &fUpstreamTime_tpczcorr, "UpstreamTime_tpczcorr/d");
fTree->Branch("fUpstreamTime_propcorr_tpczcorr", &fUpstreamTime_propcorr_tpczcorr, "UpstreamTime_propcorr_tpczcorr/d");
fTree->Branch("fNuToFLight", &fNuToFLight, "NuToFLight/d");
fTree->Branch("fNuToFCharge", &fNuToFCharge, "NuToFCharge/d");
fTree->Branch("fOpFlashT0Corrected", &fOpFlashT0Corrected, "OpFlashT0Corrected/d");

}

Expand Down
19 changes: 5 additions & 14 deletions sbndcode/LightPropagationCorrection/LightPropagationCorrection_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ void sbnd::LightPropagationCorrection::produce(art::Event & e)
fEvent = e.id().event();
fRun = e.id().run();
fSubrun = e.id().subRun();
_flashgeo->InitializeFlashGeoAlgo();

std::unique_ptr< std::vector<sbn::CorrectedOpFlashTiming> > correctedOpFlashTimes (new std::vector<sbn::CorrectedOpFlashTiming>);
art::PtrMaker<sbn::CorrectedOpFlashTiming> make_correctedopflashtime_ptr{e};
Expand Down Expand Up @@ -128,9 +129,6 @@ void sbnd::LightPropagationCorrection::produce(art::Event & e)
ResetSliceInfo();
// --- Get the slice
auto & slice = sliceVect[ix];

// --- Get the slice nu score and check whether we want to correct for it

// Now I need to get all the hits associated to this flash and get the timing for all of them
// Get the slices PFPs
double _sliceMaxNuScore = -9999.;
Expand All @@ -150,11 +148,7 @@ void sbnd::LightPropagationCorrection::produce(art::Event & e)
fRecoVx= xyz_vertex.X();
fRecoVy= xyz_vertex.Y();
fRecoVz= xyz_vertex.Z();
}
// If correct light propagation time


// Get the SP associated to the PFP and then get the hits associated to the SP. ---> Hits associated to the PFP
}
//Get the spacepoints associated to the PFParticle
std::vector<art::Ptr<recob::SpacePoint>> PFPSpacePointsVect = pfp_sp_assns.at(pfp.key());
//Get the SP Hit assns
Expand All @@ -170,7 +164,6 @@ void sbnd::LightPropagationCorrection::produce(art::Event & e)
fSpacePointY.push_back(SP->position().Y());
fSpacePointZ.push_back(SP->position().Z());
fSpacePointIntegral.push_back(SPHit.at(0)->Integral());

//Fill Bayrcenter Position
if(SP->position().X() < 0){
fChargeWeightX[0] += SP->position().X() * SPHit.at(0)->Integral();
Expand Down Expand Up @@ -299,11 +292,9 @@ void sbnd::LightPropagationCorrection::produce(art::Event & e)
newFlashTime = flasht0;
sbn::CorrectedOpFlashTiming correctedOpFlashTiming;
correctedOpFlashTiming.OpFlashT0 = originalFlashTime + fEventTriggerTime/1000 - fRWMTime/1000;
correctedOpFlashTiming.UpstreamTime_lightonly = originalFlashTime + fEventTriggerTime/1000 - fRWMTime/1000 - (Zcenter/fSpeedOfLight)/1000;
correctedOpFlashTiming.UpstreamTime_tpczcorr = originalFlashTime + fEventTriggerTime/1000 - fRWMTime/1000 - (fRecoVz/fSpeedOfLight)/1000;
correctedOpFlashTiming.UpstreamTime_propcorr_tpczcorr = newFlashTime + fEventTriggerTime/1000 - fRWMTime/1000 - (fRecoVz/fSpeedOfLight)/1000;
correctedOpFlashTiming.FMScore = _fFMScore;
correctedOpFlashTiming.SliceNuScore = _sliceMaxNuScore;
correctedOpFlashTiming.NuToFLight = (Zcenter/fSpeedOfLight)/1000;
correctedOpFlashTiming.NuToFCharge = (fRecoVz/fSpeedOfLight)/1000;
correctedOpFlashTiming.OpFlashT0Corrected = newFlashTime + fEventTriggerTime/1000 - fRWMTime/1000;
correctedOpFlashTimes->emplace_back(std::move(correctedOpFlashTiming));
}

Expand Down