A2EventAction: updated user info message, added GiBUU

werthm · werthm · commit 04a0777fe2ca · 2019-06-02T17:28:32.000+01:00
diff --git a/src/A2EventAction.cc b/src/A2EventAction.cc
@@ -95,7 +95,8 @@ void A2EventAction::EndOfEventAction(const G4Event* evt)
     {
       TString timeFmt;
       FormatTimeSec((fReqEvents - evtNb) / (Double_t)fEventRate, timeFmt);
-      G4cout << TString::Format(", %s remaining for %d events", timeFmt.Data(), fReqEvents) << G4endl;
+      G4cout << TString::Format(", %s remaining for %d/%d events",
+                timeFmt.Data(), fReqEvents-evtNb, fReqEvents) << G4endl;
     }
     else
       G4cout << G4endl;
@@ -292,6 +293,8 @@ void  A2EventAction::CloseOutput(){
     trackedPart = "";
     if (fPGA->GetFileGen()->GetType() == A2FileGenerator::kPlutoCocktail)
       trackedPart = "all stable (Pluto cocktail)";
+    else if (fPGA->GetFileGen()->GetType() == A2FileGenerator::kGiBUU)
+      trackedPart = "all (GiBUU)";
     else
     {
       for (G4int i = 0; i < fPGA->GetFileGen()->GetNParticles(); i++)

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ void A2EventAction::EndOfEventAction(const G4Event* evt)`
`95`	`95`	`{`
`96`	`96`	`TString timeFmt;`
`97`	`97`	`FormatTimeSec((fReqEvents - evtNb) / (Double_t)fEventRate, timeFmt);`
`98`		`- G4cout << TString::Format(", %s remaining for %d events", timeFmt.Data(), fReqEvents) << G4endl;`
	`98`	`+ G4cout << TString::Format(", %s remaining for %d/%d events",`
	`99`	`+ timeFmt.Data(), fReqEvents-evtNb, fReqEvents) << G4endl;`
`99`	`100`	`}`
`100`	`101`	`else`
`101`	`102`	`G4cout << G4endl;`
`@@ -292,6 +293,8 @@ void A2EventAction::CloseOutput(){`
`292`	`293`	`trackedPart = "";`
`293`	`294`	`if (fPGA->GetFileGen()->GetType() == A2FileGenerator::kPlutoCocktail)`
`294`	`295`	`trackedPart = "all stable (Pluto cocktail)";`
	`296`	`+ else if (fPGA->GetFileGen()->GetType() == A2FileGenerator::kGiBUU)`
	`297`	`+ trackedPart = "all (GiBUU)";`
`295`	`298`	`else`
`296`	`299`	`{`
`297`	`300`	`for (G4int i = 0; i < fPGA->GetFileGen()->GetNParticles(); i++)`