Skip to content

replacing m_End to fix macro conflicts with std #6

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
rsmith54 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replacing m_End to fix macro conflicts with std #6

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
2 changes: 1 addition & 1 deletion examples/example_04_HtoWWto4l.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void example_04_HtoWWto4l(const string& output_name = "output_04.root"){
ContraBoostJigsaw_R.AddInvisibleFrames((Wa_R.GetListInvisibleFrames()), 0);
ContraBoostJigsaw_R.AddInvisibleFrames((Wb_R.GetListInvisibleFrames()), 1);

g_Log << LogInfo << "Initializing tree for analysis" << m_End;
g_Log << LogInfo << "Initializing tree for analysis" << m_RF_End;
// check reconstruction trees
if(LAB_R.InitializeAnalysis()){
g_Log << LogInfo;
Expand Down
2 changes: 1 addition & 1 deletion examples/example_05_DiToptoblnu.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void example_05_DiToptoblnu(string output_name = "output_05.root"){
HemiJigsaw_R.AddFrames((Ta_R.GetListVisibleFrames()),0);
HemiJigsaw_R.AddFrames((Tb_R.GetListVisibleFrames()),1);

g_Log << LogInfo << "Initializing tree for analysis" << m_End;
g_Log << LogInfo << "Initializing tree for analysis" << m_RF_End;
// check reconstruction trees
if(LAB_R.InitializeAnalysis()){
g_Log << LogInfo;
Expand Down
2 changes: 1 addition & 1 deletion inc/RestFrames/RFLog.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ namespace RestFrames {
const RFList<RFBase>* Log(const RFList<T>* ptr){ return (const RFList<RFBase>*)ptr; }

#ifndef __MAKECINT__
#define m_End RFLog::EndMessage
#define m_RF_End RFLog::EndMessage
#define g_End RFLog::EndMessage
#endif

Expand Down
10 changes: 5 additions & 5 deletions src/CombinatoricJigsaw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ namespace RestFrames {

if(!InitializeCombinatoric()){
m_Log << LogWarning;
m_Log << "Problem initializing event info" << m_End;
m_Log << "Problem initializing event info" << m_RF_End;
return SetSpirit(false);
}

if(!LoopCombinatoric()){
m_Log << LogWarning;
m_Log << "Problem looping over combinatorics" << m_End;
m_Log << "Problem looping over combinatorics" << m_RF_End;
return SetSpirit(false);
}

Expand Down Expand Up @@ -243,7 +243,7 @@ namespace RestFrames {
m_Log << LogWarning;
m_Log << "Unable to execute Jigsaw. ";
m_Log << "Insufficienct number of inputs.";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}

Expand All @@ -254,7 +254,7 @@ namespace RestFrames {
m_Log << "Incorrect number of exclusive inputs: ";
m_Log << NTOTOT << " (required) != ";
m_Log << m_InputStates.GetN() << " (provided)";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}

Expand Down Expand Up @@ -319,7 +319,7 @@ namespace RestFrames {
if(c_max < 0){
m_Log << LogWarning;
m_Log << "Unable to find combinatoric with positive metric";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}

Expand Down
22 changes: 11 additions & 11 deletions src/DecayGenFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace RestFrames {
if(val < 0.){
m_Log << LogWarning;
m_Log << "Unable to set mass to negative value ";
m_Log << val << ". Setting to zero." << m_End;
m_Log << val << ". Setting to zero." << m_RF_End;
m_Mass = 0.;
} else {
m_Mass = val;
Expand All @@ -100,7 +100,7 @@ namespace RestFrames {
if(val < 0.){
m_Log << LogWarning;
m_Log << "Unable to set child momentum to negative value ";
m_Log << val << ". Setting to zero." << m_End;
m_Log << val << ". Setting to zero." << m_RF_End;
m_ChildP = 0.;
} else {
m_ChildP = val;
Expand All @@ -114,7 +114,7 @@ namespace RestFrames {
if(val < 0.){
m_Log << LogWarning;
m_Log << "Unable to set child gamma less than one: ";
m_Log << val << ". Setting to one." << m_End;
m_Log << val << ". Setting to one." << m_RF_End;
m_ChildGamma = 1.;
} else {
m_ChildGamma = val;
Expand All @@ -129,7 +129,7 @@ namespace RestFrames {
if(val < 0.){
m_Log << LogWarning;
m_Log << "CosDecay angle must be in [-1, 1]: ";
m_Log << val << ". Setting to random." << m_End;
m_Log << val << ". Setting to random." << m_RF_End;
m_CosDecayAngle = -2.;
} else {
m_CosDecayAngle = val;
Expand Down Expand Up @@ -223,7 +223,7 @@ namespace RestFrames {
m_Log << LogVerbose;
m_Log << "Burning in Markov Chain MC with ";
m_Log << m_N_MCMC_BurnIn;
m_Log << " trials to be discarded..." << m_End;
m_Log << " trials to be discarded..." << m_RF_End;

int N = GetNChildren();
int Nres = m_Resonances.GetN();
Expand All @@ -246,7 +246,7 @@ namespace RestFrames {
if(Msum >= M){
m_Log << LogWarning;
m_Log << "Sum of child masses is in excess of parent mass: ";
m_Log << M << " < " << Msum << m_End;
m_Log << M << " < " << Msum << m_RF_End;
return SetSpirit(false);
}

Expand All @@ -262,12 +262,12 @@ namespace RestFrames {
if(!MCMC_Generate()){
m_Log << LogWarning;
m_Log << "Problem with Markov-chain MC generation";
m_Log << m_End;
m_Log << m_RF_End;
m_Burnt = false;
return false;
}
}
m_Log << LogVerbose << "...Done" << m_End;
m_Log << LogVerbose << "...Done" << m_RF_End;

m_Burnt = true;
return true;
Expand Down Expand Up @@ -322,7 +322,7 @@ namespace RestFrames {
if(!IsSoundBody()){
m_Log << LogWarning;
m_Log << "Unable to generate event for frame";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}

Expand All @@ -332,7 +332,7 @@ namespace RestFrames {
return SetSpirit(false);
if(!MCMC_Generate()){
m_Log << "Problem with Markov-chain MC generation";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}
}
Expand All @@ -352,7 +352,7 @@ namespace RestFrames {
m_Log << LogWarning;
m_Log << "Problem in event generation: frame mass is less ";
m_Log << "than or equal to the sum of child masses: ";
m_Log << Mass << " <= " << ChildMassTOT << m_End;
m_Log << Mass << " <= " << ChildMassTOT << m_RF_End;
SetSpirit(false);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/GeneratorFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace RestFrames {
if(!GenerateFrame()){
m_Log << LogWarning;
m_Log << "Unable to generate event for this frame.";
m_Log << m_End;
m_Log << m_RF_End;
return SetSpirit(false);
}

Expand Down
14 changes: 7 additions & 7 deletions src/Group.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ namespace RestFrames {
bool Group::InitializeAnalysis(){
m_Log << LogVerbose;
m_Log << "Initializing Group for analysis...";
m_Log << m_End;
m_Log << m_RF_End;

if(m_GroupStatePtr) delete m_GroupStatePtr;
m_GroupStatePtr = &InitializeParentState();
Expand All @@ -146,11 +146,11 @@ namespace RestFrames {
m_Log << LogWarning;
m_Log << "Unable to resolve unknowns associated with ";
m_Log << "Frames in this Group with available Jigsaws";
m_Log << m_End;
m_Log << m_RF_End;
return SetBody(false);
}

m_Log << LogVerbose << "...Done" << m_End;
m_Log << LogVerbose << "...Done" << m_RF_End;
SetBody(true);
return SetMind(true);
}
Expand All @@ -168,7 +168,7 @@ namespace RestFrames {
m_Log << LogWarning;
m_Log << "Cannot find Jigsaw to Resolve State for frames:";
m_Log << endl << " " << Log(state.GetListFrames());
m_Log << m_End;
m_Log << m_RF_End;
return false;
}
m_StatesToResolve.Remove(state);
Expand Down Expand Up @@ -202,7 +202,7 @@ namespace RestFrames {
m_Log << " Frames:" << endl << " ";
m_Log << Log(state.GetListFrames()) << endl;
m_Log << " Jigsaw:" << Log(jigsawSolutionPtr);
m_Log << m_End;
m_Log << m_RF_End;
InitializeJigsaw(*jigsawSolutionPtr);
m_JigsawsToUse.Remove(*jigsawSolutionPtr);
return true;
Expand All @@ -214,7 +214,7 @@ namespace RestFrames {
if(!jigsaw.InitializeTree()){
m_Log << LogWarning;
m_Log << "Unable to initialize Jigsaw:";
m_Log << Log(jigsaw) << m_End;
m_Log << Log(jigsaw) << m_RF_End;
}
m_States += jigsaw.GetChildStates();
m_StatesToResolve -= state;
Expand Down Expand Up @@ -279,7 +279,7 @@ namespace RestFrames {
if(!(frames == match_frames)){
m_Log << LogWarning;
m_Log << "Unable to find States corresponding to Frames: " << endl;
m_Log << Log(frames) << m_End;
m_Log << Log(frames) << m_RF_End;
SetMind(false);
return RFList<State>();
}
Expand Down
2 changes: 1 addition & 1 deletion src/InvisibleFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace RestFrames {

int Nchild = T::GetNChildren();
if(Nchild > 0 || T::GetParentFrame().IsEmpty()){
T::m_Log << LogWarning << "Problem with parent or child frames" << m_End;
T::m_Log << LogWarning << "Problem with parent or child frames" << m_RF_End;
return T::SetBody(false);
}
return T::SetBody(true);
Expand Down
2 changes: 1 addition & 1 deletion src/InvisibleGenFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace RestFrames {
if(val < 0.){
m_Log << LogWarning;
m_Log << "Unable to set mass to negative value ";
m_Log << val << ". Setting to zero." << m_End;
m_Log << val << ". Setting to zero." << m_RF_End;
m_Mass = 0.;
} else {
m_Mass = val;
Expand Down
6 changes: 3 additions & 3 deletions src/InvisibleJigsaw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,21 +223,21 @@ namespace RestFrames {
if(Ndep != m_Nvis || Nout != m_Ninv){
m_Log << LogWarning;
m_Log << "Incorrect number of input/output frames for jigsaw";
m_Log<< m_End;
m_Log<< m_RF_End;
return SetBody(false);
}
for(int i = 0; i < Ndep; i++)
if(m_DependancyFrames[i].GetN() == 0){
m_Log << LogWarning;
m_Log << "Empty collection of visible frames: " << i;
m_Log << m_End;
m_Log << m_RF_End;
return SetBody(false);
}
for(int i = 0; i < Nout; i++)
if(m_ChildFrames[i].GetN() == 0){
m_Log << LogWarning;
m_Log << "Empty collection of invisible frames: " << i;
m_Log << m_End;
m_Log << m_RF_End;
return SetBody(false);
}
return SetBody(true);
Expand Down
18 changes: 9 additions & 9 deletions src/Jigsaw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ namespace RestFrames {
if(!GetParentState()){
m_Log << LogWarning;
m_Log << "Unable to initialize Jigsaw. ";
m_Log << "No parent State set." << m_End;
m_Log << "No parent State set." << m_RF_End;
return SetMind(false);
}

Expand All @@ -203,7 +203,7 @@ namespace RestFrames {
m_Log << "Unable to resolve input parent State. ";
m_Log << " Frames (capable): " << Log(GetParentFrames()) << endl;
m_Log << " Frames (requested): " << Log(GetParentState().GetListFrames());
m_Log << m_End;
m_Log << m_RF_End;
return SetMind(false);
}

Expand Down Expand Up @@ -261,13 +261,13 @@ namespace RestFrames {
if(!state){
m_Log << LogWarning;
m_Log << "Cannot find States corresponding to frame: " << endl;
m_Log << Log(frame) << " " << Log(states) << m_End;
m_Log << Log(frame) << " " << Log(states) << m_RF_End;
return SetMind(false);
}
m_Log << LogVerbose;
m_Log << "Adding dependancy State for index " << d;
m_Log << " corresponding to frame:";
m_Log << Log(frame) << m_End;
m_Log << Log(frame) << m_RF_End;
m_DependancyStates[d] += state;
}
}
Expand All @@ -279,7 +279,7 @@ namespace RestFrames {
m_Log << " Frames:" << endl << " ";
m_Log << Log(group_frames[g]) << endl;
m_Log << " Group:" << endl;
m_Log << Log(groups.Get(g)) << m_End;
m_Log << Log(groups.Get(g)) << m_RF_End;
return SetMind(false);
}
m_Log << LogVerbose;
Expand All @@ -292,7 +292,7 @@ namespace RestFrames {
m_Log << " state " << s << ": ";
m_Log << Log(group_states[s].GetListFrames()) << endl;
}
m_Log << m_End;
m_Log << m_RF_End;
m_DependancyStates[d].Add(group_states);
}
}
Expand Down Expand Up @@ -329,7 +329,7 @@ namespace RestFrames {
m_Log << " Frame:" << endl;
m_Log << Log(frame) << endl;
m_Log << " Group:" << endl;
m_Log << Log(GetGroup()) << m_End;
m_Log << Log(GetGroup()) << m_RF_End;
return;
}

Expand Down Expand Up @@ -360,13 +360,13 @@ namespace RestFrames {
m_Log << "Child frames are repeated between ";
m_Log << "more than one output index: ";
m_Log << Log(m_ChildFrames[i].Intersection(m_ChildFrames[j]));
m_Log << m_End;
m_Log << m_RF_End;
return SetBody(false);
}
for(int i = 0; i < Nout; i++)
if(m_ChildFrames[i].GetN() == 0){
m_Log << "No child frames at index ";
m_Log << i << m_End;
m_Log << i << m_RF_End;
return SetBody(false);
}
return SetBody(true);
Expand Down
12 changes: 6 additions & 6 deletions src/LabFrame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ namespace RestFrames {
int Nchild = T::GetNChildren();
if(Nchild != 1){
T::m_Log << LogWarning << "Number of LabFrame children != 1: ";
T::m_Log << Nchild << m_End;
T::m_Log << Nchild << m_RF_End;
return T::SetBody(false);
}
if(!T::GetParentFrame().IsEmpty()){
T::m_Log << LogWarning << "Parent frame of LabFrame is not empty: ";
T::m_Log << Log(T::GetParentFrame()) << m_End;
T::m_Log << Log(T::GetParentFrame()) << m_RF_End;
return T::SetBody(false);
}
return T::SetBody(true);;
Expand All @@ -82,26 +82,26 @@ namespace RestFrames {
bool LabFrame<T>::InitializeTree() {
T::m_Log << LogVerbose;
T::m_Log << "Initializing tree skeleton...";
T::m_Log << m_End;
T::m_Log << m_RF_End;

vector<RFKey> keys;
if(T::IsCircularTree(keys)){
T::m_Log << LogWarning;
T::m_Log << " Tree is circular in construction";
T::m_Log << m_End;
T::m_Log << m_RF_End;
return false;
}

if(!T::InitializeTreeRecursive()){
T::m_Log << LogWarning;
T::m_Log << " Problem with structure of tree";
T::m_Log << m_End;
T::m_Log << m_RF_End;
return false;
}

T::m_Log << LogVerbose;
T::m_Log << "...Done";
T::m_Log << m_End;
T::m_Log << m_RF_End;

return true;
}
Expand Down
Loading