Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ENDFOREACH(f)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/PluginLinkDef.h)
FOREACH(f ${PLUGIN_CLASSES_NAMES})
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/PluginLinkDef.h "\#pragma link C++ class ${f};\n")
ENDFOREACH(f)
ENDFOREACH(f)

###########################################################

Expand Down
8 changes: 4 additions & 4 deletions include/PAdaptiveMesh.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 1.02.2003
// Revised:
// Revised:

#ifndef _PADAPTIVEMESH_H_
#define _PADAPTIVEMESH_H_
Expand All @@ -22,7 +22,7 @@ class PAdaptiveMesh : public TObject {
PAdaptiveMesh *sub_tree[MAX_SUBMESH];
Double_t sub_area[MAX_SUBMESH];
TF1 *tf1;
TLine *line; //upper line for the Draw() function
TLine *line; //upper line for the Draw() function
void ReCalc(void);
PAdaptiveMesh *GetRandomBin(Double_t f_random);

Expand All @@ -31,11 +31,11 @@ class PAdaptiveMesh : public TObject {
//constructor
PAdaptiveMesh(Double_t my_x_max, Double_t my_x_min, Double_t my_y_max);
~PAdaptiveMesh();

void SetTF1(TF1 * t) {tf1 = t;};
Double_t GetRandom();
Double_t GetArea() {return area_size;};

Double_t GetXMax() {return x_max;};
Double_t GetXMin() {return x_min;};
Double_t GetYMax() {return y_max;};
Expand Down
12 changes: 6 additions & 6 deletions include/PAdaptiveMeshN.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 1.02.2008
// Revised:
// Revised:

#ifndef _PADAPTIVEMESHN_H_
#define _PADAPTIVEMESHN_H_
Expand Down Expand Up @@ -33,7 +33,7 @@ class PAdaptiveMeshN : public TObject {

void ReCalc(void); //re-calculate all volumes
void FixArray(void); //set the fixed array contributions

UInt_t pattern;
Int_t mcpoints;
Double_t threshold_diff;
Expand All @@ -45,10 +45,10 @@ class PAdaptiveMeshN : public TObject {

//constructor
//pattern sets the variables to be sampled in the GetWeight method in PChannelModel
PAdaptiveMeshN(UInt_t my_pattern, Int_t my_max_dimensions,
PAdaptiveMeshN(UInt_t my_pattern, Int_t my_max_dimensions,
PChannelModel *my_model, Double_t my_y_max);
PAdaptiveMeshN();
void SetDefaults(UInt_t my_pattern, Int_t my_max_dimensions,
void SetDefaults(UInt_t my_pattern, Int_t my_max_dimensions,
PChannelModel *my_model, Double_t my_y_max);
void ReCalcYMax(void);
~PAdaptiveMeshN();
Expand All @@ -61,7 +61,7 @@ class PAdaptiveMeshN : public TObject {
Bool_t GetRandom();

Double_t GetArea() {return area_size;};

Double_t GetArrayValue(Int_t dimension) {
if (dimension > num_dimensions) {
Warning("GetArrayValue", "dimension>num_dimensions");
Expand All @@ -87,7 +87,7 @@ class PAdaptiveMeshN : public TObject {
void SetYMax(Double_t d) {y_max = d;};

void SetMCPoints(Int_t n) {mcpoints = n;};

void SetThreshold(Double_t diff, Double_t abs) {
threshold_diff = diff;
threshold_abs = abs;
Expand Down
12 changes: 6 additions & 6 deletions include/PAngularDistribution.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 3.7.2006
// Revised:
// Revised:

#ifndef _PANGULARDISTRIBUTION_H_
#define _PANGULARDISTRIBUTION_H_
Expand All @@ -17,13 +17,13 @@


class PAngularDistribution : public PDistribution {

public:
PAngularDistribution();
PAngularDistribution(const Char_t *id, const Char_t *de);

PDistribution* Clone(const char *delme=NULL) const;

Bool_t Init(void);
Bool_t Prepare(void);
Bool_t Finalize(void);
Expand All @@ -33,7 +33,7 @@ class PAngularDistribution : public PDistribution {

void SetAngleFunction(TF1 *f) {angles1=f;};
void SetAngleFunction(TF2 *f) {angles2=f;};
void SetAngleFunction(TGraph *f, Bool_t useSpline=kFALSE,
void SetAngleFunction(TGraph *f, Bool_t useSpline=kFALSE,
Bool_t useSymmetry=kFALSE) {
anglesg = f;
spline = useSpline;
Expand All @@ -57,7 +57,7 @@ class PAngularDistribution : public PDistribution {
Bool_t direct_sampling_possible, direct_sampling_done; //Try to use direct sampling and not rejection

protected:

TF1 *angles1;
TF2 *angles2;
TH1 *anglesh;
Expand Down
6 changes: 3 additions & 3 deletions include/PAnyDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


class PAnyDistribution : public PDistribution {

public:
PAnyDistribution();
PAnyDistribution(const Char_t *id, const Char_t *de);
Expand All @@ -30,7 +30,7 @@ class PAnyDistribution : public PDistribution {
Bool_t AddEquation(TH2 *histo, const char *command); //adds an equation + cache for non-uniform distributions
Bool_t AddEquation(TH3 *histo, const char *command); //adds an equation + cache for non-uniform distributions
Bool_t AddEquation(const char *command);

void SetMaxEnhancementFactor(Double_t _max_enhance_factor) {
max_enhance_factor = _max_enhance_factor;
};
Expand All @@ -55,7 +55,7 @@ class PAnyDistribution : public PDistribution {
Double_t *x, *y, *z;
Double_t max, max_enhance_factor;

ClassDef(PAnyDistribution, 0) //Any possible distribution for a->b+c+d
ClassDef(PAnyDistribution, 0) //Any possible distribution for a->b+c+d

};

Expand Down
6 changes: 3 additions & 3 deletions include/PArray.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 1.08.2009
// Revised:
// Revised:
// PArray
// 1 or 2dim array from file(s)

Expand All @@ -27,14 +27,14 @@ class PArray : public TObject {
TArrayD *vals_2d;
Int_t real_size_1d;
Double_t scaling;


public:

//constructor
PArray(Int_t dimension);
~PArray();

void Scaling(Double_t sc) {
scaling=sc;
};
Expand Down
16 changes: 8 additions & 8 deletions include/PBatch.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 14.02.2008
//
//

#ifndef _PBATCH_H_
#define _PBATCH_H_
Expand Down Expand Up @@ -109,8 +109,8 @@ class PBatch : public TObject {
private:

Bool_t CheckAndSplit(char * arg, char delim, int *key1, int *key2);
Bool_t GetArguments(const char *a, /* const char *b, */

Bool_t GetArguments(const char *a, /* const char *b, */
char *name, char **function, char **arg1, char **arg2);
Int_t CheckObjectType(Int_t key);
Int_t GetKey(char *name, int fl, int makeflag);
Expand Down Expand Up @@ -153,13 +153,13 @@ class PBatch : public TObject {
Int_t else_position;
Int_t current_position;

static Int_t stack_num_batch[MAX_STACK_GOSUB], stack_num_bulk[MAX_STACK_GOSUB],
static Int_t stack_num_batch[MAX_STACK_GOSUB], stack_num_bulk[MAX_STACK_GOSUB],
stack_num_command[MAX_STACK_GOSUB], stack_num_pos;

void AddSpacePlaceholder(char *command);
void RemoveSpacePlaceholder(char *command);
Int_t EvalPFormula(char *command);


PValues pdummy;

Expand All @@ -182,7 +182,7 @@ class PBatch : public TObject {
TTree *tree; //Pointer to storage tree
Int_t *size_branches;
Int_t *key_branches;


public:

Expand All @@ -195,7 +195,7 @@ class PBatch : public TObject {
Bool_t AddCommand(char command, int key_a, int key1, int key2, int key3=-1, int key4=-1, int key5=-1);

void SetPosition(Int_t my_num_batch, Int_t my_num_bulk) {
num_batch = my_num_batch;
num_batch = my_num_batch;
num_bulk = my_num_bulk;
};
Int_t GetNewBatch() {return locnum_batch;};
Expand Down Expand Up @@ -260,7 +260,7 @@ class PBatch : public TObject {

void SetVarList(char *my_x) {
//Allowed commands for new variables
//Format must be "a;b;c;" with trailing ;'s
//Format must be "a;b;c;" with trailing ;'s
//If NULL don't care!
varlist = my_x;
};
Expand Down
18 changes: 9 additions & 9 deletions include/PBeamSmearing.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: I. Froehlich
// Written: 18.7.2007
// Revised:
// Revised:

#ifndef _PBEAMSMEARING_H_
#define _PBEAMSMEARING_H_
Expand All @@ -13,19 +13,19 @@


class PBeamSmearing : public PDistribution {

public:
PBeamSmearing();
~PBeamSmearing();
PBeamSmearing(const Char_t *id, const Char_t *de);

PDistribution *Clone(const char *delme=NULL) const;

Bool_t Init(void);
Bool_t Prepare(void);

void Print(const Option_t *delme=NULL) const; //Debug info

void SetMomentumSmearing(TF1 *f) {
//A function stretching the beam momentum (x=1 means no modification)
mom_smearing = f;
Expand All @@ -35,17 +35,17 @@ class PBeamSmearing : public PDistribution {
//A function stretching the beam momentum (x=1 means no modification)
mom_smearing_histo = f;
};

void SetMomentumFunction(TF1 *f) {
//A function which desribes the absolute momentum distribution
mom_function = f;
};

void SetMomentumFunction(TH1 *f) {
//A function which desribes the absolute momentum distribution
mom_function_histo = f;
};

void SetBeamParameters(Double_t th, Double_t ph, Double_t sig) {
//N.B. these are in units DEGREE because this is more convenient!
thetaBeam = th * TMath::Pi() / 180.;
Expand All @@ -57,7 +57,7 @@ class PBeamSmearing : public PDistribution {
//smearing distribution in degree
ang_smearing=f;
};

void SetReaction(const char *reaction);

private:
Expand Down
8 changes: 4 additions & 4 deletions include/PBreitWigner.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#include "PHadronModel.h"

class PBreitWigner : public PHadronModel {

public:
PBreitWigner();
PBreitWigner(const Char_t *id, const Char_t *de, Int_t key);
PDistribution* Clone(const char *delme=NULL) const;

using PDistribution::GetWeight;
using PDistribution::GetWeight;
virtual Double_t GetWeight(Double_t *mass, Int_t *didx=NULL);
using PDistribution::SampleMass;
Bool_t SampleMass(Double_t *mass, Int_t *didx=NULL);
Expand All @@ -25,9 +25,9 @@ class PBreitWigner : public PHadronModel {
//overwrites the partial model from the data base
width_model = m;
};

protected:

Double_t mr; // Resonance pole mass
PChannelModel *width_model;

Expand Down
12 changes: 6 additions & 6 deletions include/PBulkInterface.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Author: Ingo Froehlich
// Written: 10/07/2007
// Modified:
// Modified:
// PBulkInterface Class Header

#ifndef _PBULKINTERFACE_H_
Expand All @@ -22,10 +22,10 @@ class PBulkInterface: public TObject {

private:

static Int_t gBulkCounter;
static Int_t gBulkCounter;

protected:

Double_t current_weight;
Int_t bulk_id; //Unique bulk ID
Int_t fPriority; //order when adding the bulk in PReaction
Expand All @@ -38,7 +38,7 @@ class PBulkInterface: public TObject {
public:

PBulkInterface();

virtual bool Modify(PParticle ** array, int *decay_done, int *num, int maxnum); //Modify particle bulk

void SetWeight(Double_t c) {current_weight = c;};
Expand Down Expand Up @@ -66,7 +66,7 @@ ClassDef(PBulkInterface,0) // Pluto bulk interface base class
};


#endif
#endif



Expand Down
Loading