From 6a1caa6bfc8dcf54a5744796055cf1572468afba Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 6 Jun 2011 11:44:44 +0000 Subject: [PATCH] Restoring the generation of HTML documentation (Natalia) + related changes (PH) --- CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- STEER/AliBaseCalibViewer.cxx | 18 +++++++++--------- TPC/AliTPCBoundaryVoltError.cxx | 4 ++-- TPC/AliTPCCalibViewer.cxx | 30 +++++++++++++++--------------- TPC/AliTPCCorrection.cxx | 4 ++-- TPC/AliTPCExBBShape.h | 4 ++-- TPC/AliTPCExBTwist.h | 4 ++-- TPC/AliTPCFCVoltError3D.cxx | 4 ++-- TPC/AliTPCGGVoltError.h | 4 ++-- TPC/AliTPCROCVoltError3D.cxx | 4 ++-- TPC/AliTPCSpaceCharge.cxx | 4 ++-- TPC/AliTPCSpaceCharge3D.cxx | 4 ++-- cmake/ALICE_CMake.cmake | 2 +- macros/mkhtml.C | 8 ++++---- 14 files changed, 78 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f3011fde38..0fc53d066f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,10 +219,23 @@ add_custom_target(DA-all) add_custom_target(check-all) add_custom_target(check-hxml) add_custom_target(smell-all) +add_custom_target(htmldoc) add_custom_target(par-all) add_custom_target(test-par-all) -# Add Modules +#NY file(GLOB CFILES_LIST ${CMAKE_SOURCE_DIR}/macros/*.C) + +add_custom_command(TARGET htmldoc + PRE_BUILD + COMMAND mkdir -p html + COMMAND rm -rf html/roothtml + COMMAND rm -f html/picts + COMMAND cd html && + aliroot -q -b \"mkhtml.C(0,1)\" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + + +# Add Modules # ------------------------------ foreach(MODULE ${MODDIRS}) set(${MODULE}ALIBS) @@ -233,8 +246,25 @@ foreach(MODULE ${MODDIRS}) add_custom_target(${MODULE}-all-static) add_dependencies(alilibs-static "${MODULE}-static") add_subdirectory(${MODULE}) + +#NY set(dir "${CMAKE_SOURCE_DIR}/${MODULE}") +#NY if (EXISTS "${dir}") +#NY file(GLOB CFILES_MOD ${dir}/*.C) +#NY list(LENGTH CFILES_MOD len) +#NY if (${len} GREATER 0) +#NY list(APPEND CFILES_LIST "${CFILES_MOD}") +#NY endif (${len} GREATER 0) +#NY endif(EXISTS "${dir}") endforeach(MODULE) +#NY foreach(cfile ${CFILES_LIST}) +#NY add_custom_command(TARGET htmldoc +#NY PRE_BUILD +#NY COMMAND cd html && +#NY aliroot -b -q \"mkhtml.C(\"${cfile}\")\" > /dev/null +#NY WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +#NY endforeach(cfile) + if(DATE_FOUND AND AMORE_FOUND) include (CMakeDA) endif(DATE_FOUND AND AMORE_FOUND) diff --git a/STEER/AliBaseCalibViewer.cxx b/STEER/AliBaseCalibViewer.cxx index f8890cee1ed..c18724b01c0 100644 --- a/STEER/AliBaseCalibViewer.cxx +++ b/STEER/AliBaseCalibViewer.cxx @@ -338,11 +338,11 @@ TH1F* AliBaseCalibViewer::SigmaCut(TH1F *histogram, Float_t mean, Float_t sigma, // pm: Decide weather Begin_Latex t > 0 End_Latex (first case) or Begin_Latex t End_Latex arbitrary (secound case) // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx }{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } , for t > 0 + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = (#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx) / (#int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx), for t > 0 or - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex - begin_macro(source) + Begin_Macro(source) { Float_t mean = 0; Float_t sigma = 1.5; @@ -353,7 +353,7 @@ TH1F* AliBaseCalibViewer::SigmaCut(TH1F *histogram, Float_t mean, Float_t sigma, for (Int_t i = 0; i <50000;i++) distribution->Fill(rand.Gaus(mean, sigma)); Float_t *ar = distribution->GetArray(); - TCanvas* macro_example_canvas = new TCanvas("macro_example_canvas_SigmaCut", "", 350, 350); + TCanvas* macro_example_canvas = new TCanvas("cAliBaseCalibViewer", "", 350, 350); macro_example_canvas->Divide(0,3); TVirtualPad *pad1 = macro_example_canvas->cd(1); pad1->SetGridy(); @@ -373,7 +373,7 @@ TH1F* AliBaseCalibViewer::SigmaCut(TH1F *histogram, Float_t mean, Float_t sigma, shistPM->Draw(); return macro_example_canvas; } - end_macro + End_Macro */ Float_t *array = histogram->GetArray(); @@ -693,7 +693,7 @@ Int_t AliBaseCalibViewer::Integrate(const Char_t* drawCommand, const Char_t* sec // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex */ @@ -804,9 +804,9 @@ TH1F* AliBaseCalibViewer::Integrate(TH1F *histogram, Float_t mean, Float_t sigma // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex - begin_macro(source) + Begin_Macro(source) { Float_t mean = 0; Float_t sigma = 1.5; @@ -832,7 +832,7 @@ TH1F* AliBaseCalibViewer::Integrate(TH1F *histogram, Float_t mean, Float_t sigma return macro_example_canvas_Integrate; } - end_macro + End_Macro */ diff --git a/TPC/AliTPCBoundaryVoltError.cxx b/TPC/AliTPCBoundaryVoltError.cxx index 7e927c8d75c..4ec62a70fda 100644 --- a/TPC/AliTPCBoundaryVoltError.cxx +++ b/TPC/AliTPCBoundaryVoltError.cxx @@ -41,10 +41,10 @@ // and the corresponding offset in z is added. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,300); +// TCanvas *c2 = new TCanvas("cAliTPCBoundaryVoltError","cAliTPCBoundaryVoltError",500,300); // AliTPCBoundaryVoltError bve; // Float_t val = 40;// [Volt]; 40V corresponds to 1mm // /* IFC shift, CE follows, ROC follows by factor half */ diff --git a/TPC/AliTPCCalibViewer.cxx b/TPC/AliTPCCalibViewer.cxx index a8d972d55c3..ee3cb3087ad 100644 --- a/TPC/AliTPCCalibViewer.cxx +++ b/TPC/AliTPCCalibViewer.cxx @@ -687,7 +687,7 @@ Int_t AliTPCCalibViewer::SigmaCut(const char* drawCommand, Int_t sector, const c // sigmaMax: up to which sigma around the mean/median/LTM the histogram is generated (in units of sigma, Begin_Latex t #sigma End_Latex) // sigmaStep: the binsize of the generated histogram // Begin_Latex - // f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx }{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + // f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = (#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx) / (#int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx) // End_Latex // // @@ -899,7 +899,7 @@ Int_t AliTPCCalibViewer::Integrate(const char* drawCommand, Int_t sector, // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex */ if (sector >= 0 && sector < 72) { @@ -920,7 +920,7 @@ Int_t AliTPCCalibViewer::IntegrateOld(const char* drawCommand, const char* secto // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex */ @@ -1004,7 +1004,7 @@ Int_t AliTPCCalibViewer::Integrate(const char* drawCommand, const char* sector, // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex */ @@ -1263,22 +1263,22 @@ TH1F* AliTPCCalibViewer::SigmaCut(TH1F *const histogram, Float_t mean, Float_t s // pm: Decide weather Begin_Latex t > 0 End_Latex (first case) or Begin_Latex t End_Latex arbitrary (secound case) // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx }{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } , for t > 0 + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = (#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx + #int_{#mu}^{#mu - t #sigma} f(x, #mu, #sigma) dx) / (#int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx), for t > 0 or - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{#mu}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex - begin_macro(source) + Begin_Macro(source) { Float_t mean = 0; Float_t sigma = 1.5; Float_t sigmaMax = 4; gROOT->SetStyle("Plain"); - TH1F *distribution = new TH1F("Distribution1", "Distribution f(x, #mu, #sigma)", 1000,-5,5); + TH1F *distribution = new TH1F("Distrib1", "Distribution f(x, #mu, #sigma)", 1000,-5,5); TRandom rand(23); for (Int_t i = 0; i <50000;i++) distribution->Fill(rand.Gaus(mean, sigma)); Float_t *ar = distribution->GetArray(); - TCanvas* macro_example_canvas = new TCanvas("macro_example_canvas_SigmaCut", "", 350, 350); + TCanvas* macro_example_canvas = new TCanvas("cAliTPCCalibViewer1", "", 350, 350); macro_example_canvas->Divide(0,3); TVirtualPad *pad1 = macro_example_canvas->cd(1); pad1->SetGridy(); @@ -1298,7 +1298,7 @@ TH1F* AliTPCCalibViewer::SigmaCut(TH1F *const histogram, Float_t mean, Float_t s shistPM->Draw(); return macro_example_canvas; } - end_macro + End_Macro */ Float_t *array = histogram->GetArray(); @@ -1410,20 +1410,20 @@ TH1F* AliTPCCalibViewer::Integrate(TH1F *const histogram, Float_t mean, Float_t // "sigmaStep": the binsize of the generated histogram, -1 means, that the maximal reasonable stepsize is used // The actual work is done on the array. /* Begin_Latex - f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #frac{#int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx}{ #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx } + f(x, #mu, #sigma) #Rightarrow S(t, #mu, #sigma) = #int_{-#infty}^{#mu + t #sigma} f(x, #mu, #sigma) dx / #int_{-#infty}^{+#infty} f(x, #mu, #sigma) dx End_Latex - begin_macro(source) + Begin_Macro(source) { Float_t mean = 0; Float_t sigma = 1.5; Float_t sigmaMax = 4; gROOT->SetStyle("Plain"); - TH1F *distribution = new TH1F("Distribution2", "Distribution f(x, #mu, #sigma)", 1000,-5,5); + TH1F *distribution = new TH1F("Distrib2", "Distribution f(x, #mu, #sigma)", 1000,-5,5); TRandom rand(23); for (Int_t i = 0; i <50000;i++) distribution->Fill(rand.Gaus(mean, sigma)); Float_t *ar = distribution->GetArray(); - TCanvas* macro_example_canvas = new TCanvas("macro_example_canvas_Integrate", "", 350, 350); + TCanvas* macro_example_canvas = new TCanvas("cAliTPCCalibViewer2", "", 350, 350); macro_example_canvas->Divide(0,2); TVirtualPad *pad1 = macro_example_canvas->cd(1); pad1->SetGridy(); @@ -1438,7 +1438,7 @@ TH1F* AliTPCCalibViewer::Integrate(TH1F *const histogram, Float_t mean, Float_t return macro_example_canvas_Integrate; } - end_macro + End_Macro */ diff --git a/TPC/AliTPCCorrection.cxx b/TPC/AliTPCCorrection.cxx index cacb23f1324..ee77dc77dbc 100644 --- a/TPC/AliTPCCorrection.cxx +++ b/TPC/AliTPCCorrection.cxx @@ -55,10 +55,10 @@ // Note: This class is normally used via the class AliTPCComposedCorrection // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",700,1050); c2->Divide(2,3); +// TCanvas *c2 = new TCanvas("cAliTPCCorrection","cAliTPCCorrection",700,1050); c2->Divide(2,3); // AliTPCROCVoltError3D roc; // EXAMPLE PLOTS - SEE BELOW // roc.SetOmegaTauT1T2(0,1,1); // B=0 // Float_t z0 = 1; // at +1 cm -> A side diff --git a/TPC/AliTPCExBBShape.h b/TPC/AliTPCExBBShape.h index f2763f8a037..c1c0b5fa066 100644 --- a/TPC/AliTPCExBBShape.h +++ b/TPC/AliTPCExBBShape.h @@ -15,10 +15,10 @@ //

// The class allows "effective Omega Tau" corrections. // End_Html -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,300); +// TCanvas *c2 = new TCanvas("cAliTPCExBBShape","cAliTPCExBBShape",500,300); // AliTPCExBBShape exb; // AliMagF mag("mag","mag"); // 0.5 Tesla (solenoid) // exb.SetBField(&mag); // use Bfield from AliMagF diff --git a/TPC/AliTPCExBTwist.h b/TPC/AliTPCExBTwist.h index 5a5799ba5bc..a203cb22932 100644 --- a/TPC/AliTPCExBTwist.h +++ b/TPC/AliTPCExBTwist.h @@ -18,10 +18,10 @@ // in cartesian coordinates. They can be set via the member functions SetXTwist and SetYTwist. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,300); +// TCanvas *c2 = new TCanvas("cAliTPCExBTwist","cAliTPCExBTwist",500,300); // AliTPCExBTwist twist; // twist.SetXTwist(0.001); // x angle in [rad] // twist.SetXTwist(0.0005); // y angle in [rad] diff --git a/TPC/AliTPCFCVoltError3D.cxx b/TPC/AliTPCFCVoltError3D.cxx index 27999c8303a..033c80dbb9f 100644 --- a/TPC/AliTPCFCVoltError3D.cxx +++ b/TPC/AliTPCFCVoltError3D.cxx @@ -46,10 +46,10 @@ // // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,450); +// TCanvas *c2 = new TCanvas("cAliTPCVoltError3D","cAliTPCVoltError3D",500,450); // AliTPCFCVoltError3D fc; // fc.SetOmegaTauT1T2(0,1,1); // fc.SetRotatedClipVoltA(0,40); diff --git a/TPC/AliTPCGGVoltError.h b/TPC/AliTPCGGVoltError.h index 9e5f935aaf9..b43cc265a95 100644 --- a/TPC/AliTPCGGVoltError.h +++ b/TPC/AliTPCGGVoltError.h @@ -23,10 +23,10 @@ // be used for this purpose. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,300); +// TCanvas *c2 = new TCanvas("cAliTPCGGVoltError","cAliTPCGGVoltError",500,300); // AliTPCGGVoltError gg; // gg.SetDeltaVGGA(-40); gg.SetDeltaVGGC(-40); // 40 Volt offset // gg.InitGGVoltErrorDistortion(); diff --git a/TPC/AliTPCROCVoltError3D.cxx b/TPC/AliTPCROCVoltError3D.cxx index 1aa8422686b..f93e38dab11 100644 --- a/TPC/AliTPCROCVoltError3D.cxx +++ b/TPC/AliTPCROCVoltError3D.cxx @@ -49,10 +49,10 @@ // function SetElectronArrivalCorrection, the electron-arrival correction is added to the dz calculation. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,400); +// TCanvas *c2 = new TCanvas("cAliTPCROCVoltError3D","cAliTPCROCVoltError3D",500,400); // AliTPCROCVoltError3D roc; // roc.SetElectronArrivalCorrection(kFALSE); // Correction for electron arrival offset, IROC vs OROC // roc.SetROCDisplacement(kTRUE); // include the chamber offset in z when calculating the dz diff --git a/TPC/AliTPCSpaceCharge.cxx b/TPC/AliTPCSpaceCharge.cxx index d0306bbabf2..67f06af2cb0 100644 --- a/TPC/AliTPCSpaceCharge.cxx +++ b/TPC/AliTPCSpaceCharge.cxx @@ -33,10 +33,10 @@ // the shape of the distortions is given below. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,300); +// TCanvas *c2 = new TCanvas("cAliTPCSpaceCharge","cAliTPCSpaceCharge",500,300); // AliTPCSpaceCharge sc; // sc.SetOmegaTauT1T2(-0.32,1,1); // B=0.5 Tesla // sc.SetCorrectionFactor(0.0015); diff --git a/TPC/AliTPCSpaceCharge3D.cxx b/TPC/AliTPCSpaceCharge3D.cxx index a413635b326..0bbe6392c51 100644 --- a/TPC/AliTPCSpaceCharge3D.cxx +++ b/TPC/AliTPCSpaceCharge3D.cxx @@ -41,10 +41,10 @@ // is superpositioned with a few leaking wires at arbitrary positions. // End_Html // -// Begin_Macro(source) +// Begin_Macro(source) // { // gROOT->SetStyle("Plain"); gStyle->SetPalette(1); -// TCanvas *c2 = new TCanvas("c2","c2",500,400); +// TCanvas *c2 = new TCanvas("cAliTPCSpaceCharge3D","cAliTPCSpaceCharge3D",500,400); // AliTPCSpaceCharge3D sc; // sc.WriteChargeDistributionToFile("SC_zr2_GGleaks.root"); // sc.SetSCDataFileName("SC_zr2_GGleaks.root"); diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake index a9e6a7adeb1..f67cf78f664 100644 --- a/cmake/ALICE_CMake.cmake +++ b/cmake/ALICE_CMake.cmake @@ -266,7 +266,7 @@ macro(ALICE_BuildPackage) ALICE_SetPackageVariable(PEDEFINE "EDEFINE" "${EDEFINE}" "${EDEFINE}") ALICE_SetPackageVariable(PEXPORT "EXPORT" "${EXPORT}" "${EXPORT}") - message(${CMAKE_INCLUDE_EXPORT_DIRECTORY}) +# message(${CMAKE_INCLUDE_EXPORT_DIRECTORY}) ALICE_SetPackageVariable(PEXPORTDEST "EXPORTDEST" "${CMAKE_INCLUDE_EXPORT_DIRECTORY}" "${CMAKE_INCLUDE_EXPORT_DIRECTORY}") ALICE_SetPackageVariable(PINC "INC" "${EINCLUDE};${MODULE}" "${EINCLUDE};${MODULE}") ALICE_SetPackageVariable(PELIBS "ELIBS" "${ELIBS}" "${ELIBS}") diff --git a/macros/mkhtml.C b/macros/mkhtml.C index 798f2dca239..b3fea66ca39 100644 --- a/macros/mkhtml.C +++ b/macros/mkhtml.C @@ -1,3 +1,7 @@ +#include +#include +#include + void mkhtml (char *macro=0, Int_t force=0) { // to run this macro, you must have the correct .rootrc file // in your galice directory. @@ -9,8 +13,6 @@ void mkhtml (char *macro=0, Int_t force=0) { // loadlibs(); THtml html; html.SetProductName("AliRoot"); - TStopwatch timer; - timer.Start(); if(macro) { gROOT->LoadMacro(macro); html.Convert(macro,"Example Macro"); @@ -68,6 +70,4 @@ void mkhtml (char *macro=0, Int_t force=0) { html.MakeAll(force,"[A-Z]*"); } - timer.Stop(); - timer.Print(); } -- 2.39.3