Commit 06f42c1c authored by Adrien Matta's avatar Adrien Matta
Browse files

* Fixing Miniball simulation

        - The angle was not filled in making subsequent analysis not
          working
parent 788f45c5
Pipeline #102893 passed with stages
in 11 minutes and 26 seconds
......@@ -41,6 +41,7 @@
// NPTool header
#include "Miniball.hh"
#include "CalorimeterScorers.hh"
#include "InteractionScorers.hh"
#include "RootOutput.h"
#include "MaterialManager.hh"
#include "NPSDetectorFactory.hh"
......@@ -69,6 +70,7 @@ Miniball::Miniball(){
m_MiniballScorer = 0;
m_ClusterDetector = 0;
m_NumberOfPlacedVolume = 0;
m_Inter=new TInteractionCoordinates();
}
Miniball::~Miniball(){
......@@ -237,12 +239,13 @@ void Miniball::InitializeRootOutput(){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// Read sensitive part and fill the Root tree.
// Called at in the EventAction::EndOfEventAvtion
// Called at in the EventAction::EndOfEventAction
void Miniball::ReadSensitive(const G4Event* ){
m_Event->Clear();
///////////
CalorimeterScorers::PS_Calorimeter* Scorer= (CalorimeterScorers::PS_Calorimeter*) m_MiniballScorer->GetPrimitive(0);
// InteractionScorers::PS_Interactions* Inter= (InteractionScorers::PS_Interactions*) m_MiniballScorer->GetPrimitive(1);
unsigned int size = Scorer->GetMult();
for(unsigned int i = 0 ; i < size ; i++){
......@@ -255,6 +258,7 @@ void Miniball::ReadSensitive(const G4Event* ){
m_Event->SetEnergy(DetectorNbr,Energy);
//m_Event->SetAngle(DetectorNbr,Angle);
m_Event->SetTime(DetectorNbr,Time);
m_Event->SetAngle(DetectorNbr, m_Inter->GetDetectedAngleTheta(i));
}
}
}
......@@ -272,8 +276,10 @@ void Miniball::InitializeScorers() {
// Otherwise the scorer is initialised
vector<int> level; level.push_back(1);
G4VPrimitiveScorer* Calorimeter= new CalorimeterScorers::PS_Calorimeter("Crystal",level, 0) ;
G4VPrimitiveScorer* Inter= new InteractionScorers::PS_Interactions("Inter",m_Inter, 1) ;
//and register it to the multifunctionnal detector
m_MiniballScorer->RegisterPrimitive(Calorimeter);
m_MiniballScorer->RegisterPrimitive(Inter);
G4SDManager::GetSDMpointer()->AddNewDetector(m_MiniballScorer) ;
}
......
......@@ -38,6 +38,8 @@ using namespace std;
#include "NPSVDetector.hh"
#include "TMiniballData.h"
#include "NPInputParser.h"
#include "TInteractionCoordinates.h"
class Miniball : public NPS::VDetector{
////////////////////////////////////////////////////
/////// Default Constructor and Destructor /////////
......@@ -84,6 +86,7 @@ class Miniball : public NPS::VDetector{
public: // Scorer
// Initialize all Scorer used by the MUST2Array
void InitializeScorers() ;
TInteractionCoordinates* m_Inter;
// Associated Scorer
G4MultiFunctionalDetector* m_MiniballScorer ;
......@@ -104,7 +107,7 @@ class Miniball : public NPS::VDetector{
// Shape type
vector<string> m_Shape ;
// Needed for dynamic loading of the library
public:
static NPS::VDetector* Construct();
......
......@@ -27,6 +27,7 @@
#include "G4SystemOfUnits.hh"
#include "G4EmCalculator.hh"
#include "G4VPhysicalVolume.hh"
#include "G4IonTable.hh"
#include "NPFunction.h"
#include "NPInputParser.h"
#include "NPOptionManager.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment