diff --git a/macros/runCond/tempExtract b/macros/runCond/tempExtract index 4d7a395..2dd1ce3 100755 --- a/macros/runCond/tempExtract +++ b/macros/runCond/tempExtract Binary files differ diff --git a/macros/runCond/tempExtract.C b/macros/runCond/tempExtract.C index 0cffe64..8db70b8 100755 --- a/macros/runCond/tempExtract.C +++ b/macros/runCond/tempExtract.C @@ -50,16 +50,27 @@ int argc_copy = argc; - TApplication theApp("Analysis", &argc, argv); - argc = theApp.Argc(); - argv = theApp.Argv(); + TApplication* theApp = new TApplication("Analysis", &argc, argv); + argc = theApp->Argc(); + argv = theApp->Argv(); + bool runBatch = false; + + for (int i = 1; iSetBatch(); + } + } + style->SetPadLeftMargin(0.12); int exit = tempExtract(argc,argv); Printf("End"); - theApp.Run(kTRUE); + if (!runBatch) { + theApp->Run(!runBatch); + } return exit; } @@ -205,7 +216,8 @@ v_temp.push_back(atof(a_tt[j][indTemp].c_str())); time_t time_val = mktime(&date); v_time.push_back((double)time_val); - Info("tempExtract","%4.2f / %4.2f",atof(a_tt[j][indTemp].c_str()),(double)time_val); + // Info printout deactivated for batch + // Info("tempExtract","%4.2f / %4.2f",atof(a_tt[j][indTemp].c_str()),(double)time_val); } std::vector::iterator it=v_time.begin(); @@ -224,6 +236,8 @@ vr_time.Write(Form("v_%s_time",v_vname_tt[i].c_str())); vr_temp.Write(Form("v_%s_temp",v_vname_tt[i].c_str())); + Info("tempExtract","TT data written to %s/temperature.root",dn_lumi.Data()); + if (v_vname_tt[i].compare("TT_AT6")==0) { v_vr_plot_TT.push_back(vr_time); v_vr_plot_TT.push_back(vr_temp); @@ -271,7 +285,8 @@ v_temp.push_back(atof(a_it[j][indTemp].c_str())); time_t time_val = mktime(&date); v_time.push_back((double)time_val); - Info("tempExtract","%4.2f / %4.2f",atof(a_it[j][indTemp].c_str()),(double)time_val); + // Info printout deactivated for batch + // Info("tempExtract","%4.2f / %4.2f",atof(a_it[j][indTemp].c_str()),(double)time_val); } std::vector::iterator it=v_time.begin(); for (std::vector::iterator j=v_temp.begin(); j!=v_temp.end(); it++, j++) { @@ -289,6 +304,7 @@ vr_time.Write(Form("v_%s_time",v_vname_it[i].c_str())); vr_temp.Write(Form("v_%s_temp",v_vname_it[i].c_str())); + Info("tempExtract","IT data written to %s/temperature.root",dn_lumi.Data()); if (v_vname_it[i].compare("IT_A1")==0) { v_vr_plot_T1.push_back(vr_time); @@ -459,7 +475,7 @@ f_output->Close(); - return 0; + return EXIT_SUCCESS; }