diff --git a/NPSimulation/Detectors/AGATA/AGATA.cc b/NPSimulation/Detectors/AGATA/AGATA.cc
index 2b5d1a717f3b6e9a48c7d64a137538ec8578ad3d..d950a94f0fca55bca1b9a28952f8c5c244aa4bca 100644
--- a/NPSimulation/Detectors/AGATA/AGATA.cc
+++ b/NPSimulation/Detectors/AGATA/AGATA.cc
@@ -43,6 +43,7 @@
// NPTool header
#include "AGATA.hh"
#include "CalorimeterScorers.hh"
+#include "InteractionScorers.hh"
#include "RootOutput.h"
#include "MaterialManager.hh"
#include "NPSDetectorFactory.hh"
@@ -241,8 +242,10 @@ void AGATA::InitializeScorers() {
// Otherwise the scorer is initialised
vector<int> level; level.push_back(1);
G4VPrimitiveScorer* Calorimeter= new CalorimeterScorers::PS_Calorimeter("Crystal",level, 0) ;
+ G4VPrimitiveScorer* Interaction= new InteractionScorers::PS_Interactions("Inter",0) ;
//and register it to the multifunctionnal detector
m_AGATAScorer->RegisterPrimitive(Calorimeter);
+ m_AGATAScorer->RegisterPrimitive(Interaction);
G4SDManager::GetSDMpointer()->AddNewDetector(m_AGATAScorer) ;
}
diff --git a/NPSimulation/Detectors/LightPipe/LightPipe.cc b/NPSimulation/Detectors/LightPipe/LightPipe.cc
index c9465f09ded7f55d798f72e90712e83ccef29ab3..51ff49bff7d16e59601cc824084824ebb72c135f 100644
--- a/NPSimulation/Detectors/LightPipe/LightPipe.cc
+++ b/NPSimulation/Detectors/LightPipe/LightPipe.cc
@@ -1,18 +1,18 @@
/*****************************************************************************
- * Copyright (C) 2009-2018 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2018 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: Greg Christian contact address: gchristian@tamu.edu *
+ * Original Author: Greg Christian contact address: gchristian@tamu.edu *
* *
- * Creation Date : July 2018 *
+ * Creation Date : July 2018 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe LightPipe simulation *
+ * This class describe LightPipe simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -75,7 +75,8 @@ LightPipe::LightPipe(){
m_VisPD = new G4VisAttributes(G4Colour(0.1, 0.2, 0.3));
m_ScintillatorMaterial = CreateScintillatorMaterial();
m_PipeMaterial = CreatePipeMaterial();
- //m_Wrapping = CreateWrappingMaterial();
+ //m_WrappingMaterial = CreateWrappingMaterial();
+ m_WrappingMaterial = NULL;
m_ReflectiveSurface = CreateReflectiveSurface();
m_VisSquare->SetForceWireframe(true);
diff --git a/NPSimulation/Detectors/LightPipe/LightPipe.hh b/NPSimulation/Detectors/LightPipe/LightPipe.hh
index 9980c8d220a36915901e9bfd29a84dd4259f0ae5..1aa4b7bac5dbfc9578a2e9a6ab990d6aec899e40 100644
--- a/NPSimulation/Detectors/LightPipe/LightPipe.hh
+++ b/NPSimulation/Detectors/LightPipe/LightPipe.hh
@@ -1,20 +1,20 @@
#ifndef LightPipe_h
#define LightPipe_h 1
/*****************************************************************************
- * Copyright (C) 2009-2018 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2018 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: Greg Christian contact address: gchristian@tamu.edu *
+ * Original Author: Greg Christian contact address: gchristian@tamu.edu *
* *
- * Creation Date : July 2018 *
+ * Creation Date : July 2018 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe LightPipe simulation *
+ * This class describe LightPipe simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
diff --git a/NPSimulation/Detectors/Miniball/Miniball.cc b/NPSimulation/Detectors/Miniball/Miniball.cc
index 0da1686617c935f21e1078cbc970f3337309f91d..302e9f60db2e86aa01b71654dd8f657d91d4067d 100644
--- a/NPSimulation/Detectors/Miniball/Miniball.cc
+++ b/NPSimulation/Detectors/Miniball/Miniball.cc
@@ -58,7 +58,7 @@ namespace Miniball_NS{
const double EnergyThreshold = 0.01*MeV;
const double ResoTime = 4.5*ns ;
const double ResoEnergy = 0.003*MeV ;
- const double ResoAngle = 5*deg;
+ // const double ResoAngle = 5*deg;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Detectors/beam_dump/beam_dump.cc b/NPSimulation/Detectors/beam_dump/beam_dump.cc
index aa1460dda104d8663db6b37f1d09a98f8ce31b9d..674882e5a3b0b0e5795e7e8fdc3b9dae18f10381 100755
--- a/NPSimulation/Detectors/beam_dump/beam_dump.cc
+++ b/NPSimulation/Detectors/beam_dump/beam_dump.cc
@@ -1,18 +1,18 @@
/*****************************************************************************
- * Copyright (C) 2009-2017 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2017 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: valerian contact address: girardalcindor@ganil.fr *
+ * Original Author: valerian contact address: girardalcindor@ganil.fr *
* *
- * Creation Date : November 2017 *
+ * Creation Date : November 2017 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe beam_dump simulation *
+ * This class describe beam_dump simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -59,8 +59,8 @@ namespace beam_dump_NS{
const double EnergyThreshold = 0.0*MeV;
const double ResoTime = 0.0*ns ;
const double ResoEnergy = 0.0*MeV ;
- const double Radius = 20*cm ;
- const double Width = 10*cm ;
+ //const double Radius = 20*cm ;
+ //const double Width = 10*cm ;
// const double Thickness = 34*um ;
}
diff --git a/Projects/MUGAST_LISE/Analysis.cxx b/Projects/MUGAST_LISE/Analysis.cxx
index 153cb7ccd01e9189f3b84e92860764f8dec7ffb6..60d2a1f7d9b65792f417b06e4a6e1098638851f4 100644
--- a/Projects/MUGAST_LISE/Analysis.cxx
+++ b/Projects/MUGAST_LISE/Analysis.cxx
@@ -55,8 +55,8 @@ void Analysis::Init() {
string WindowsMaterial = m_DetectorManager->GetWindowsMaterial();
// energy losses
- string light=NPL::ChangeNameToG4Standard(myReaction.GetNucleus3().GetName());
- string beam=NPL::ChangeNameToG4Standard(myReaction.GetNucleus1().GetName());
+ string light=NPL::ChangeNameToG4Standard(myReaction.GetNucleus3()->GetName());
+ string beam=NPL::ChangeNameToG4Standard(myReaction.GetNucleus1()->GetName());
LightTarget = NPL::EnergyLoss(light+"_"+TargetMaterial+".G4table","G4Table",100 );
LightAl = NPL::EnergyLoss(light+"_Al.G4table","G4Table",100);