IAP GITLAB

Skip to content
Snippets Groups Projects
Commit cfa5b51b authored by ralfulrich's avatar ralfulrich
Browse files

used Nuclear-Extended stack as new default!

parent f1cf8dd9
No related branches found
No related tags found
1 merge request!70Resolve "add Nucleus to corsika id conversion"
Pipeline #273 failed
...@@ -12,11 +12,19 @@ ...@@ -12,11 +12,19 @@
#ifndef _corsika_setup_setupstack_h_ #ifndef _corsika_setup_setupstack_h_
#define _corsika_setup_setupstack_h_ #define _corsika_setup_setupstack_h_
#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
#include <corsika/stack/super_stupid/SuperStupidStack.h> #include <corsika/stack/super_stupid/SuperStupidStack.h>
// this is an auxiliary help typedef, which I don't know how to put
// into NuclearStackExtension.h where it belongs...
template<typename StackIter> using ExtendedParticleInterfaceType =
corsika::stack::nuclear_extension::NuclearParticleInterface<corsika::stack::super_stupid::SuperStupidStack::PIType, StackIter>;
namespace corsika::setup { namespace corsika::setup {
typedef corsika::stack::super_stupid::SuperStupidStack Stack; using Stack = corsika::stack::nuclear_extension::NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack, ExtendedParticleInterfaceType>;
// typedef corsika::stack::super_stupid::SuperStupidStack Stack;
} }
#endif #endif
...@@ -40,7 +40,6 @@ namespace corsika::stack { ...@@ -40,7 +40,6 @@ namespace corsika::stack {
: public InnerParticleInterface<StackIteratorInterface> { : public InnerParticleInterface<StackIteratorInterface> {
public: public:
// template<typename >
using ExtendedParticleInterface = using ExtendedParticleInterface =
NuclearParticleInterface<InnerParticleInterface, StackIteratorInterface>; NuclearParticleInterface<InnerParticleInterface, StackIteratorInterface>;
...@@ -61,8 +60,6 @@ namespace corsika::stack { ...@@ -61,8 +60,6 @@ namespace corsika::stack {
err << "NuclearStackExtension: no A and Z specified for new Nucleus!"; err << "NuclearStackExtension: no A and Z specified for new Nucleus!";
throw std::runtime_error(err.str()); throw std::runtime_error(err.str());
} }
// SetNuclearRef(corsika::stack::ParticleBase<StackIteratorInterface>::GetStackData().GetNucleusNextRef());
// // store this nucleus data ref
SetNuclearRef( SetNuclearRef(
GetStackData().GetNucleusNextRef()); // store this nucleus data ref GetStackData().GetNucleusNextRef()); // store this nucleus data ref
SetNuclearA(vA); SetNuclearA(vA);
...@@ -70,16 +67,11 @@ namespace corsika::stack { ...@@ -70,16 +67,11 @@ namespace corsika::stack {
} else { } else {
SetNuclearRef(-1); // this is not a nucleus SetNuclearRef(-1); // this is not a nucleus
} }
// corsika::stack::super_stupid::NuclearParticleInterface<StackIteratorInterface>::
InnerParticleInterface<StackIteratorInterface>:: InnerParticleInterface<StackIteratorInterface>::
// InnerParticleInterface::
SetParticleData(vDataPID, vDataE, vMomentum, vPosition, vTime); SetParticleData(vDataPID, vDataE, vMomentum, vPosition, vTime);
} }
// void SetParticleData(NuclearParticleInterface<StackIteratorInterface>& void SetParticleData(InnerParticleInterface<StackIteratorInterface>&,
// parent,
void SetParticleData(InnerParticleInterface<StackIteratorInterface>& parent,
// void SetParticleData(InnerParticleInterface& parent,
const corsika::particles::Code vDataPID, const corsika::particles::Code vDataPID,
const corsika::units::si::HEPEnergyType vDataE, const corsika::units::si::HEPEnergyType vDataE,
const MomentumVector& vMomentum, const MomentumVector& vMomentum,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment