From d1138f8883a5978bb14bc6920fb0f40e72436e47 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Thu, 25 Jul 2019 18:19:59 +0200
Subject: [PATCH] Manual sweep of bugfix in 21.0
---
.../DataQualityUtils/src/HanOutputFile.cxx | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
index adb22229ecb..6ebc31a951b 100644
--- a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
+++ b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
@@ -852,7 +852,7 @@ void getImageBuffer(TImage* img, TCanvas* myC, char** x, int* y){
bool HanOutputFile::saveHistogramToFile( std::string nameHis, std::string location, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName,int cnvsType){
std::pair<std::string,std::string> pngAndJson = getHistogram(nameHis,groupDir,drawRefs,run_min_LB,pathName,cnvsType);
//std::string tosave = getHistogramPNG(nameHis, groupDir, drawRefs, run_min_LB, pathName);
- if (pngAndJson.first== "") {
+ if (pngAndJson.first== ""&&pngAndJson.second=="") {
return false;
}
std::string namePNG = nameHis;
@@ -874,12 +874,12 @@ bool HanOutputFile::saveHistogramToFile( std::string nameHis, std::string locati
std::string
HanOutputFile::
getHistogramPNG( std::string nameHis, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName){
- int cnvsType = 0;
+ int cnvsType = 1;
return getHistogram(nameHis, groupDir,drawRefs,run_min_LB,pathName,cnvsType).first;
}
std::pair<std::string,std::string> HanOutputFile:: getHistogramJSON( std::string nameHis, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName){
- int cnvsType = 1;
+ int cnvsType = 2;
return getHistogram(nameHis, groupDir,drawRefs,run_min_LB,pathName,cnvsType);
}
@@ -1442,7 +1442,9 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
displayExtra(myC,display);
myC->RedrawAxis();
- ratioplot(myC ,h,hRef,display); //RatioPad
+ if (hRef) {
+ ratioplot(myC ,h,hRef,display); //RatioPad
+ }
myC->cd();//might be unnecessary
polynomial(myC,display,h); //draw polynome for TH1
@@ -2244,13 +2246,16 @@ void HanOutputFile::ratioplot (TCanvas* myC_upperpad ,TH1* h,TH1* hRef,std::stri
TProfile* ph = dynamic_cast<TProfile*>( h );
TH1F *clonehist ;
TH1F *clonehistref;
- if( ph != 0 ) {//profile
- std::cout<<"it is a TProfile\n";
+ //transform if profiles
+ if( ph != 0 ) {
clonehist=(TH1F*)ph->ProjectionX();
- clonehistref=(TH1F*)phRef->ProjectionX();
- }else{
+ } else {
clonehist=(TH1F*)h->Clone();
clonehist->Sumw2();
+ }
+ if ( phRef != 0 ) {
+ clonehistref=(TH1F*)phRef->ProjectionX();
+ }else{
clonehistref=(TH1F*)hRef->Clone();
clonehistref->Sumw2();
}
--
GitLab