Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc (revision 9235) +++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc (revision 9303) @@ -57,4 +57,5 @@ #include "MLogManip.h" +#include "MString.h" #include "MParList.h" #include "MCamEvent.h" @@ -232,7 +233,7 @@ pad->cd(2); - if (gPad->FindObject(Form("%s;proj", fName.Data()))) - { - TH1 *h=fSum->Projection(Form("%s;proj", fName.Data())); + if (gPad->FindObject(MString::Format("%s;proj", fName.Data()))) + { + TH1 *h=fSum->Projection(MString::Format("%s;proj", fName.Data())); if (h->GetMaximum()>0) gPad->SetLogy(); @@ -240,14 +241,14 @@ pad->cd(5); - if (gPad->FindObject(Form("%s;rad", fName.Data()))) - fSum->RadialProfile(Form("%s;rad", fName.Data())); + if (gPad->FindObject(MString::Format("%s;rad", fName.Data()))) + fSum->RadialProfile(MString::Format("%s;rad", fName.Data())); pad->cd(6); - if (gPad->FindObject(Form("%s;az", fName.Data()))) - fSum->AzimuthProfile(Form("%s;az", fName.Data())); + if (gPad->FindObject(MString::Format("%s;az", fName.Data()))) + fSum->AzimuthProfile(MString::Format("%s;az", fName.Data())); pad->cd(4); gPad->cd(1); - MHCamera *cam = (MHCamera*)gPad->FindObject(Form("%s;err", fName.Data())); + MHCamera *cam = (MHCamera*)gPad->FindObject(MString::Format("%s;err", fName.Data())); if (cam) cam->SetCamContent(*fSum, fErrorRelative ? 1 : 2); @@ -262,5 +263,5 @@ AppendPad(); - TString name = Form("%s_1", pad->GetName()); + TString name = MString::Format("%s_1", pad->GetName()); TPad *p = new TPad(name,name,0.005, 0.5, 0.66, 0.995,col,0,0); p->SetFrameBorderMode(0); @@ -271,5 +272,5 @@ pad->cd(); - name = Form("%s_2", pad->GetName()); + name = MString::Format("%s_2", pad->GetName()); p = new TPad(name,name,0.66, 0.5, 0.995, 0.995,col,0,0); p->SetFrameBorderMode(0); @@ -277,5 +278,5 @@ p->Draw(); p->cd(); - TH1 *h = fSum->Projection(Form("%s;proj", fName.Data()), 50); + TH1 *h = fSum->Projection(MString::Format("%s;proj", fName.Data()), 50); h->SetTitle("Projection"); h->SetBit(kCanDelete); @@ -283,5 +284,5 @@ pad->cd(); - name = Form("%s_3", pad->GetName()); + name = MString::Format("%s_3", pad->GetName()); p = new TPad(name,name,0.005, 0.005, 3./8, 0.5,col,0,0); p->SetFrameBorderMode(0); @@ -292,5 +293,5 @@ pad->cd(); - name = Form("%s_4", pad->GetName()); + name = MString::Format("%s_4", pad->GetName()); p = new TPad(name,name,3./8, 0.005, 6./8-0.005, 0.5,col,0,0); p->SetFrameBorderMode(0); @@ -306,5 +307,5 @@ MHCamera *cam = new MHCamera(*fSum->GetGeometry()); - cam->SetName(Form("%s;err", fName.Data())); + cam->SetName(MString::Format("%s;err", fName.Data())); cam->SetTitle(e); cam->SetYTitle(fSum->GetYaxis()->GetTitle()); @@ -314,5 +315,5 @@ pad->cd(); - name = Form("%s_5", pad->GetName()); + name = MString::Format("%s_5", pad->GetName()); p = new TPad(name,name,6./8,0.25,0.995,0.5,col,0,0); p->SetFrameBorderMode(0); @@ -320,5 +321,5 @@ p->Draw(); p->cd(); - h = (TH1*)fSum->RadialProfile(Form("%s;rad", fName.Data()), 20); + h = (TH1*)fSum->RadialProfile(MString::Format("%s;rad", fName.Data()), 20); h->SetTitle("Radial Profile"); h->SetBit(kCanDelete|TH1::kNoStats); @@ -326,5 +327,5 @@ pad->cd(); - name = Form("%s_6", pad->GetName()); + name = MString::Format("%s_6", pad->GetName()); p = new TPad(name,name,6./8,0.005,0.995,0.25,col,0,0); p->SetFrameBorderMode(0); @@ -332,5 +333,5 @@ p->Draw(); p->cd(); - h = (TH1*)fSum->AzimuthProfile(Form("%s;az", fName.Data()), 30); + h = (TH1*)fSum->AzimuthProfile(MString::Format("%s;az", fName.Data()), 30); h->SetTitle("Azimuth Profile"); h->SetBit(kCanDelete|TH1::kNoStats); Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHCamera.cc (revision 9235) +++ trunk/MagicSoft/Mars/mhist/MHCamera.cc (revision 9303) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.112 2009-01-21 14:37:07 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.113 2009-02-07 20:47:41 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -77,4 +77,5 @@ #include "MH.h" +#include "MString.h" #include "MBinning.h" #include "MHexagon.h" @@ -1848,7 +1849,5 @@ newtxt2.PaintText(-range*.85, -range*.85, text); - text = ""; - text += Form("%.2f", range*.3*fGeomCam->GetConvMm2Deg()); - text += "\\circ"; + text = MString::Format("%.2f\\circ", range*.3*fGeomCam->GetConvMm2Deg()); text = text.Strip(TString::kLeading); @@ -1881,5 +1880,5 @@ const Float_t step = (islog && min>0 ? log10(max/min) : max-min); const Int_t firsts = step/48*3 < 1e-8 ? 8 : (Int_t)floor(log10(step/48*3)); - const TString opt = Form("%%.%if", firsts>0 ? 0 : TMath::Abs(firsts)); + const TString opt = MString::Format("%%.%if", firsts>0 ? 0 : TMath::Abs(firsts)); /* for (Int_t i=0; i The name // is unique. For ExecuteEvent gPad is always correctly set. - const TString name = Form("%p;%p;PixelContent", this, gPad); + const TString name = MString::Format("%p;%p;PixelContent", this, gPad); TCanvas *old = (TCanvas*)gROOT->GetListOfCanvases()->FindObject(name); @@ -2375,6 +2374,6 @@ // Just to get the right (maximum) binning TProfile *half[2]; - half[0] = RadialProfileS(s0, inner,Form("%sInner",GetName())); - half[1] = RadialProfileS(s0, outer,Form("%sOuter",GetName())); + half[0] = RadialProfileS(s0, inner, MString::Format("%sInner",GetName())); + half[1] = RadialProfileS(s0, outer, MString::Format("%sOuter",GetName())); for (Int_t i=0; i<2; i++) @@ -2420,6 +2419,6 @@ // Just to get the right (maximum) binning TProfile *half[2]; - half[0] = AzimuthProfileA(inner,Form("%sInner",GetName())); - half[1] = AzimuthProfileA(outer,Form("%sOuter",GetName())); + half[0] = AzimuthProfileA(inner, MString::Format("%sInner",GetName())); + half[1] = AzimuthProfileA(outer, MString::Format("%sOuter",GetName())); for (Int_t i=0; i<2; i++)