Skip to content
Open
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
5 changes: 4 additions & 1 deletion src/SBMS/sbms.py
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,10 @@ def AddROOT(env):
AddROOT.ROOT_CFLAGS += ' -DHAVE_TMVA=1'
AddROOT.ROOT_LINKFLAGS += ' -lTMVA'

AddCompileFlags(env, AddROOT.ROOT_CFLAGS)
# AddCompileFlags(env, AddROOT.ROOT_CFLAGS)
# ROOT CFLAGS are actually C++ flags: apply only to CXXFLAGS
env.AppendUnique(CXXFLAGS = AddROOT.ROOT_CFLAGS.split())

AddLinkFlags(env, AddROOT.ROOT_LINKFLAGS)

if env['OSNAME'].startswith("Darwin_macosx"):
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/UTILITIES/BeamProperties.cc
Original file line number Diff line number Diff line change
Expand Up @@ -446,18 +446,18 @@ void BeamProperties::fillTaggedFluxFromCCDB() {
calib->GetCalib(tagh_scaled_energy, "PHOTON_BEAM/hodoscope/scaled_energy_range");
calib->GetCalib(tagm_scaled_energy, "PHOTON_BEAM/microscope/scaled_energy_range");

double e_low_tagh = 0;
double e_high_tagh = 0;
// double e_low_tagh = 0;
// double e_high_tagh = 0;
double e_low_tagm = 0;
double e_high_tagm = 0;
double delta_e = 0;
if (endpoint_calib.size() > 0 && photon_endpoint.size() > 0)
delta_e = photon_endpoint[0] - endpoint_calib[0];

if (tagh_scaled_energy.size() > 0) {
e_low_tagh = tagh_scaled_energy[tagh_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e;
e_high_tagh = tagh_scaled_energy[0][2] * endpoint_calib[0] + delta_e;
}
// if (tagh_scaled_energy.size() > 0) {
// e_low_tagh = tagh_scaled_energy[tagh_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e;
// e_high_tagh = tagh_scaled_energy[0][2] * endpoint_calib[0] + delta_e;
// }
if (tagm_scaled_energy.size() > 0) {
e_low_tagm = tagm_scaled_energy[tagm_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e;
e_high_tagm = tagm_scaled_energy[0][2] * endpoint_calib[0] + delta_e;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ int main( int argc, char* argv[] ){



// print out the bin center
double step = ( highMass - lowMass ) / kNumBins;
double stept = ( hight - lowt ) / kNumBinst;
// print out the bin center
double step = ( highMass - lowMass ) / static_cast<double>(kNumBins);
double stept = ( hight - lowt ) / static_cast<double>(kNumBinst);
ofstream outfile[kNumBins][kNumBinst];
// descend into the directory that contains the bins
chdir( fitDir.c_str() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ int main( int argc, char* argv[] ){



double step = ( highMass - lowMass ) / kNumBins;
double stept = ( hight - lowt ) / kNumBinst;
double step = ( highMass - lowMass ) / static_cast<double>(kNumBins);
double stept = ( hight - lowt ) / static_cast<double>(kNumBinst);

ofstream outfile;
outfile.open( outfileName.c_str() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int main( int argc, char* argv[] ){
exit(1);
}

double step = ( highMass - lowMass ) / kNumBins;
double step = ( highMass - lowMass ) / static_cast<double>(kNumBins);

ofstream outfile;
outfile.open( outfileName.c_str() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ int main( int argc, char* argv[] ){
exit(1);
}

double step = ( highMass - lowMass ) / kNumBins;
double stept = ( hight - lowt ) / kNumBinst;
double step = ( highMass - lowMass ) / static_cast<double>(kNumBins);
double stept = ( hight - lowt ) / static_cast<double>(kNumBinst);

ofstream outfile;
outfile.open( outfileName.c_str() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ positive.push_back(wave("G1+", 4, 1));
Biggest_lm(ws, &LMAX);


double step = ( highMass - lowMass ) / kNumBins;
double stept = ( hight - lowt ) / kNumBinst;
double step = ( highMass - lowMass ) / static_cast<double>(kNumBins);
double stept = ( hight - lowt ) / static_cast<double>(kNumBinst);

ofstream outfile;
outfile.open( outfileName.c_str() );
Expand Down