Merge pull request #309 from project8/feature/truthWriting

Record event properties
project8 · Mar 22, 2024 · 2fb94dd · 2fb94dd
2 parents afb71a3 + 0386ff4
commit 2fb94dd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/Source/IO/LMCEvent.cc b/Source/IO/LMCEvent.cc
@@ -23,6 +23,7 @@ namespace locust
     void Event::AddTrack(const Track aTrack)
     {
         fStartFrequencies.push_back( aTrack.StartFrequency );
+        fEndFrequencies.push_back( aTrack.EndFrequency );
         fTrackPowers.push_back( aTrack.TrackPower );
         fStartTimes.push_back( aTrack.StartTime );
         fTrackLengths.push_back( aTrack.TrackLength );

diff --git a/Source/IO/LMCEvent.hh b/Source/IO/LMCEvent.hh
@@ -34,6 +34,7 @@ namespace locust
             int fRandomSeed;
 
             std::vector<double> fStartFrequencies;
+            std::vector<double> fEndFrequencies;
             std::vector<double> fTrackPowers;
             std::vector<double> fStartTimes;
             std::vector<double> fEndTimes;

diff --git a/Source/IO/LMCRootTreeWriter.cc b/Source/IO/LMCRootTreeWriter.cc
@@ -57,6 +57,7 @@ namespace locust
         aTree->Branch("EventID", &anEvent->fEventID, "EventID/I");
         aTree->Branch("ntracks", &anEvent->fNTracks, "ntracks/I");
         aTree->Branch("StartFrequencies", "std::vector<double>", &anEvent->fStartFrequencies);
+        aTree->Branch("EndFrequencies", "std::vector<double>", &anEvent->fEndFrequencies);
         aTree->Branch("StartTimes", "std::vector<double>", &anEvent->fStartTimes);
         aTree->Branch("EndTimes", "std::vector<double>", &anEvent->fEndTimes);
         aTree->Branch("TrackLengths", "std::vector<double>", &anEvent->fTrackLengths);

diff --git a/Source/IO/LMCTrack.hh b/Source/IO/LMCTrack.hh
@@ -33,6 +33,7 @@ namespace locust
             double EndTime = -99.;
             double TrackLength = -99.;
             double StartFrequency = -99.;
+            double EndFrequency = -99.;
             double LOFrequency = -99.;
             double TrackPower = -99.;
             double Slope = -99.;

diff --git a/Source/Kassiopeia/LMCCyclotronRadiationExtractor.cc b/Source/Kassiopeia/LMCCyclotronRadiationExtractor.cc
@@ -66,10 +66,12 @@ namespace locust
             double tY = aFinalParticle.GetPosition().Y();
             fInterface->aTrack.Radius = pow(tX*tX + tY*tY, 0.5);
             fInterface->aTrack.RadialPhase = calcOrbitPhase(tX, tY);
+            std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     	}
     	else
     	{
             fInterface->aTrack.EndTime = tTime;
+            fInterface->aTrack.EndFrequency = aFinalParticle.GetCyclotronFrequency();
     	}
 #endif
 
@@ -183,14 +185,16 @@ namespace locust
 
         if (!fInterface->fDoneWithSignalGeneration)  // if Locust is still acquiring voltages.
         {
-            if (fInterface->fTOld == 0.)
+            if (!(fInterface->fTOld > 0.))
             {
             	fPitchAngle = -99.;  // new electron needs central pitch angle reset.
             	double dt = aFinalParticle.GetTime() - anInitialParticle.GetTime();
                 fFieldCalculator->SetNFilterBinsRequired( dt );
                 UpdateTrackProperties( aFinalParticle, fInterface->fSampleIndex, 1 );
+            	LPROG(lmclog,"Updated track properties at sample " << fInterface->fSampleIndex );
             }
 
+
             double t_poststep = aFinalParticle.GetTime();
             fNewParticleHistory.push_back(ExtractKassiopeiaParticle(anInitialParticle, aFinalParticle));