Update event properties output

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required( VERSION 3.1 )
 
 # Define the project
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( locust_mc VERSION 2.7.2)
+project( locust_mc VERSION 2.8.0)
 
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )

Source/IO/LMCEvent.cc

@@ -24,6 +24,7 @@ namespace locust
     {
         fStartFrequencies.push_back( aTrack.StartFrequency );
         fEndFrequencies.push_back( aTrack.EndFrequency );
+        fAvgFrequencies.push_back( aTrack.AvgFrequency );
         fTrackPowers.push_back( aTrack.TrackPower );
         fStartTimes.push_back( aTrack.StartTime );
         fTrackLengths.push_back( aTrack.TrackLength );

Source/IO/LMCEvent.hh

@@ -35,6 +35,7 @@ namespace locust
 
             std::vector<double> fStartFrequencies;
             std::vector<double> fEndFrequencies;
+            std::vector<double> fAvgFrequencies;
             std::vector<double> fTrackPowers;
             std::vector<double> fStartTimes;
             std::vector<double> fEndTimes;

Source/IO/LMCRootTreeWriter.cc

@@ -58,6 +58,7 @@ namespace locust
         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("AvgFrequencies", "std::vector<double>", &anEvent->fAvgFrequencies);
         aTree->Branch("StartTimes", "std::vector<double>", &anEvent->fStartTimes);
         aTree->Branch("EndTimes", "std::vector<double>", &anEvent->fEndTimes);
         aTree->Branch("TrackLengths", "std::vector<double>", &anEvent->fTrackLengths);

Source/IO/LMCTrack.hh

@@ -34,6 +34,7 @@ namespace locust
             double TrackLength = -99.;
             double StartFrequency = -99.;
             double EndFrequency = -99.;
+            double AvgFrequency = -99.;
             double LOFrequency = -99.;
             double TrackPower = -99.;
             double Slope = -99.;

Source/Kassiopeia/LMCCyclotronRadiationExtractor.cc

@@ -60,6 +60,7 @@ namespace locust
 #ifdef ROOT_FOUND
     	if (bStart)
     	{
+            fStartingIndex = index;
             fInterface->aTrack.StartTime = tTime;
             fInterface->aTrack.StartFrequency = aFinalParticle.GetCyclotronFrequency();
             double tX = aFinalParticle.GetPosition().X();
@@ -72,6 +73,10 @@ namespace locust
     	{
             fInterface->aTrack.EndTime = tTime;
             fInterface->aTrack.EndFrequency = aFinalParticle.GetCyclotronFrequency();
+            unsigned nElapsedSamples = index - fStartingIndex;
+            fInterface->aTrack.AvgFrequency = ( fInterface->aTrack.AvgFrequency * nElapsedSamples + aFinalParticle.GetCyclotronFrequency() ) / ( nElapsedSamples + 1);
+            fInterface->aTrack.TrackLength = tTime - fInterface->aTrack.StartTime;
+            fInterface->aTrack.Slope = (fInterface->aTrack.EndFrequency - fInterface->aTrack.StartFrequency) / (fInterface->aTrack.TrackLength);
     	}
 #endif
 

Source/Kassiopeia/LMCCyclotronRadiationExtractor.hh

@@ -60,6 +60,7 @@ namespace locust
             FieldCalculator* fFieldCalculator;
             kl_interface_ptr_t fInterface;
             unsigned fSampleIndex;
+            unsigned fStartingIndex;
     };
 
 

Source/Kassiopeia/LMCEventHold.cc

@@ -16,12 +16,14 @@ namespace locust
 
     EventHold::EventHold() :
             fTruthOutputFilename("LocustEventProperties.root"),
+            fAccumulateTruthInfo( false ),
             fInterface( KLInterfaceBootstrapper::get_instance()->GetInterface() )
     {
     }
 
     EventHold::EventHold( const EventHold& aOrig ) : KSComponent(),
             fTruthOutputFilename("LocustEventProperties.root"),
+            fAccumulateTruthInfo( false ),
             fInterface( aOrig.fInterface )
     {
     }
@@ -66,6 +68,10 @@ namespace locust
 	    {
 	    	fTruthOutputFilename = aParam["truth-output-filename"]().as_string();
 	    }
+	    if ( aParam.has( "accumulate-truth-info" ) )
+	    {
+	    	fAccumulateTruthInfo = aParam["accumulate-truth-info"]().as_bool();
+	    }
 
 
     	return true;
@@ -94,7 +100,17 @@ namespace locust
 #ifdef ROOT_FOUND
         FileWriter* aRootTreeWriter = RootTreeWriter::get_instance();
         aRootTreeWriter->SetFilename(sFileName);
-        aRootTreeWriter->OpenFile("RECREATE");
+        if (fAccumulateTruthInfo)
+        {
+        	// This option should be used when running pileup.  We will need to
+        	// figure out how to explicitly increment the event ID, given that the
+        	// same (identical) simulation is being run multiple times in this case.
+        	aRootTreeWriter->OpenFile("UPDATE");
+        }
+        else
+        {
+        	aRootTreeWriter->OpenFile("RECREATE");
+        }
         fInterface->anEvent->AddTrack( fInterface->aTrack );
         aRootTreeWriter->WriteEvent( fInterface->anEvent );
         aRootTreeWriter->WriteRunParameters(fInterface->aRunParameter);

Source/Kassiopeia/LMCEventHold.hh

@@ -35,6 +35,7 @@ namespace locust
             bool ConfigureByInterface();
             bool Configure( const scarab::param_node& aParam );
             std::string fTruthOutputFilename;
+            bool fAccumulateTruthInfo;
 
 
         public: