Skip to content

Revert "First changes to make CRADLE work" #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "First changes to make CRADLE work" #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions config/config_base.txt
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions include/CRADLE/ConfigParser.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,19 @@ struct NuclearOptions {
struct General {
int Verbosity = 1;
int Loop = 0;
int Threads = 2;
int Threads = 1;
std::string Output = "output.txt";
};

struct CouplingConstants {
double CS = 0.0;
double CSP = 0.0;
double CV = 1.0;
double CVP = 1.0;
double CVP = 0.0;
double CT = 0.0;
double CTP = 0.0;
double CA = 1.2754;
double CAP = 1.2754;
double a = 1.;
double b = 0.;
};

struct Cuts {
Expand Down
4 changes: 0 additions & 4 deletions include/CRADLE/DecayManager.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class DecayManager {
void RegisterDecayMode(const std::string, DecayMode&);
void RegisterParticle(Particle*);
void RegisterDistribution(const std::string, std::vector<std::vector<double> >*);
void RegisterBetaType(const std::string, const std::string); //////// ajout de SL 12/05/2023
void RegisterSpectrumGenerator(const std::string, SpectrumGenerator&);
void RegisterBasicSpectrumGenerators();
void ListRegisteredParticles();
Expand All @@ -41,8 +40,6 @@ class DecayManager {
DecayMode& GetDecayMode(const std::string);
std::vector<std::vector<double> >* GetDistribution(const std::string);

std::string GetBetaType(const std::string); /////// ajout de SL 12/05/2023

ConfigOptions configOptions;

private:
Expand All @@ -52,7 +49,6 @@ class DecayManager {

std::map<const std::string, DecayMode&> registeredDecayModes;
std::map<const std::string, std::vector<std::vector<double> >* > registeredDistributions;
std::map<const std::string, std::string> registeredBetaType; /////// ajout de SL 12/05/2023
//std::vector<Particle*> particleStack;
std::map<const std::string, Particle*> registeredParticles;
std::string outputName;
Expand Down
1 change: 0 additions & 1 deletion include/CRADLE/Particle.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class Particle {
oss << name << "\t" << currentExcitationEnergy << "\t" << GetKinEnergy() << "\t" << fourMomentum(0) << "\t" << fourMomentum(1) << "\t" << fourMomentum(2) << "\t" << fourMomentum(3);
return oss.str();
};

inline void SetMomentum(ublas::vector<double> v) { fourMomentum = v; };
inline void SetExcitationEnergy(double e) { currentExcitationEnergy = e; fourMomentum(0)+=e; };
double GetLifetime() const;
Expand Down
Loading