DrawHistos();
}
-
- if (selIterator != 0) delete selIterator;
- selIterator = 0;
- if (procIterator != 0) delete procIterator;
- procIterator = 0;
+ delete selIterator;
+ delete procIterator;
if (!success)
{
TFile* file = new TFile(Form("/tmp/ListAnalyserMacroData_%s.root", gSystem->Getenv("USER")), "READ");
if (!file)
{
- Error("Draw histograms", Form("Cannot open file \"/tmp/ListAnalyserMacroData_%s.root\"",
- gSystem->Getenv("USER")));
+ Error("Draw histograms", "Cannot open file \"/tmp/ListAnalyserMacroData_%s.root\"",
+ gSystem->Getenv("USER"));
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("Cannot open file \"/tmp/ListAnalyserMacroData_%s.root\"", gSystem->Getenv("USER")),
kMBIconExclamation, kMBOk);
if (myHist != 0) myHist->Draw();
else
{
- Error("Draw histograms", Form("No histogram for histo macro \"%s\" found!",
- fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName()));
+ Error("Draw histograms", "No histogram for histo macro \"%s\" found!",
+ fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName());
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("No histogram for histo macro \"%s\" found!",
fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName()), kMBIconExclamation, kMBOk);
}
else
{
- Error("Draw histograms", Form("No data for histo macro \"%s\" found!\nMaybe no objects have been selected.",
- fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName()));
+ Error("Draw histograms", "No data for histo macro \"%s\" found!\nMaybe no objects have been selected.",
+ fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName());
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("No data for histo macro \"%s\" found!\nMaybe no objects have been selected.",
fM->fDataFromMacroList->At(indexOfHistoMacro)->GetName()), kMBIconExclamation, kMBOk);
indexOfMacro1 = i;
if (!(t = (TTree*)file->Get(Form("ObjectData%d", i))))
{
- Error("Draw histograms", Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
- fM->fDataFromMacroList->At(i)->GetName()));
+ Error("Draw histograms", "No data for macro \"%s\" found!\nMaybe no objects have been selected.",
+ fM->fDataFromMacroList->At(i)->GetName());
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
fM->fDataFromMacroList->At(i)->GetName()), kMBIconExclamation, kMBOk);
indexOfMacro2 = i;
if (!(tFriend1 = (TTree*)file->Get(Form("ObjectData%d", i))))
{
- Error("Draw histograms", Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
- fM->fDataFromMacroList->At(i)->GetName()));
+ Error("Draw histograms", "No data for macro \"%s\" found!\nMaybe no objects have been selected.",
+ fM->fDataFromMacroList->At(i)->GetName());
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
fM->fDataFromMacroList->At(i)->GetName()),
indexOfMacro3 = i;
if (!(tFriend2 = (TTree*)file->Get(Form("ObjectData%d", i))))
{
- Error("Draw histograms", Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
- fM->fDataFromMacroList->At(i)->GetName()));
+ Error("Draw histograms", "No data for macro \"%s\" found!\nMaybe no objects have been selected.",
+ fM->fDataFromMacroList->At(i)->GetName());
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error - Draw histograms",
Form("No data for macro \"%s\" found!\nMaybe no objects have been selected.",
fM->fDataFromMacroList->At(i)->GetName()), kMBIconExclamation, kMBOk);
{
name = new Char_t[AliEveListAnalyser::fkMaxMacroNameLength];
memset(name, '\0', sizeof(Char_t) * AliEveListAnalyser::fkMaxMacroNameLength);
- sprintf(name, "%s", fteField->GetText());
+ snprintf(name, AliEveListAnalyser::fkMaxMacroNameLength, "%s", fteField->GetText());
// Add path to textfield -> Path is "./" -> Use length for the name + 2
Char_t pathname[AliEveListAnalyser::fkMaxMacroNameLength + 2];
memset(pathname, '\0', sizeof(Char_t) * (AliEveListAnalyser::fkMaxMacroNameLength + 2));
- sprintf(pathname, "./%s", fteField->GetText());
+ snprintf(pathname, AliEveListAnalyser::fkMaxMacroNameLength + 2, "./%s", fteField->GetText());
fteField->SetText(pathname);
AddMacro(name);
- if (name != 0) delete name;
- name = 0;
+ delete [] name;
}
// Different path
else
strncpy(path, fteField->GetText(), strlen(fteField->GetText()) - strlen(name));
// Ignore the slash "/" in name
- AddMacro(name + 1, path);
-
- if (path != 0) delete path;
- path = 0;
+ AddMacro(name + 1, path);
+ delete [] path;
}
}
else
macro->GetObjectType(), macro->GetObjectType2()));
else
{
- Error("AliEveListAnalyserEditor::InheritMacroList", Form("Failed to inherit the macro \"%s\"!", key->GetName()));
+ Error("AliEveListAnalyserEditor::InheritMacroList", "Failed to inherit the macro \"%s\"!", key->GetName());
}
}
ftlMacroList->GetSelectedEntries(iterator);
fM->RemoveSelectedMacros(iterator);
- if (iterator != 0) delete iterator;
+ delete iterator;
iterator = new TList();
ftlMacroSelList->GetSelectedEntries(iterator);
fM->fMacroListSelected = 0;
UpdateMacroList();
-
- if (iterator != 0) delete iterator;
- iterator = 0;
+ delete iterator;
}
//______________________________________________________
macro->GetObjectType(), macro->GetObjectType2()));
else
{
- Error("AliEveListAnalyserEditor::SaveMacroList", Form("Failed to inherit the macro \"%s\"!", key->GetName()));
+ Error("AliEveListAnalyserEditor::SaveMacroList", "Failed to inherit the macro \"%s\"!", key->GetName());
}
}
}
else
{
Error("AliEveListAnalyserEditor::UpdateMacroList()",
- Form("Macro \"%s/%s.C\" is neither a selection macro nor a process macro!",
- macro->GetPath(), macro->GetName()));
+ "Macro \"%s/%s.C\" is neither a selection macro nor a process macro!",
+ macro->GetPath(), macro->GetName());
}
}
else
{
Error("AliEveListAnalyserEditor::UpdateMacroList()",
- Form("Macro list is corrupted: Macro \"%s\" not found!", key->GetName()));
+ "Macro list is corrupted: Macro \"%s\" not found!", key->GetName());
}
}
Bool_t useGivenType2 = kFALSE;
// Remove white-spaces
- TString* typeStr = new TString();
-
- typeStr->Append(fTextObjectType->GetText());
+ TString* typeStr = new TString(fTextObjectType->GetText());
typeStr->ReplaceAll(" ", "");
fTextObjectType->SetText(typeStr->Data(), kFALSE);
- TString* typeStr2 = new TString();
-
- typeStr2->Append(fTextObjectType2->GetText());
+ TString* typeStr2 = new TString(fTextObjectType2->GetText());
typeStr2->ReplaceAll(" ", "");
fTextObjectType2->SetText(typeStr2->Data(), kFALSE);
// Cancel creation
if (!useGivenType)
{
- if (typeStr != 0)
- {
- typeStr->Clear();
- delete typeStr;
- }
+ typeStr->Clear();
+ delete typeStr;
typeStr = 0;
- if (typeStr2 != 0)
- {
- typeStr2->Clear();
- delete typeStr2;
- }
+ typeStr2->Clear();
+ delete typeStr2;
typeStr2 = 0;
return;
// Cancel creation
if (!useGivenType2)
{
- if (typeStr != 0)
- {
- typeStr->Clear();
- delete typeStr;
- }
+ typeStr->Clear();
+ delete typeStr;
typeStr = 0;
- if (typeStr2 != 0)
- {
- typeStr2->Clear();
- delete typeStr2;
- }
+ typeStr2->Clear();
+ delete typeStr2;
typeStr2 = 0;
return;
if(!gSystem->AccessPathName(Form("./%s.C", name)))
{
// If there is already a file with this name -> Error
- Error("AliEveGeneralMacroWizard::Create", Form("A macro \"%s.C\" already exists in the current directory!\nPlease choose another name!", name));
+ Error("AliEveGeneralMacroWizard::Create", "A macro \"%s.C\" already exists in the current directory!\nPlease choose another name!", name);
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error",
Form("A macro \"%s.C\" already exists in the current directory!\nPlease choose another name!", name), kMBIconExclamation, kMBOk);
return;
Char_t* line = 0x0; Int_t iline = 0;
while((line = comment->GetLine(TGLongPosition(0,iline++), 200))) fprintf(fp, "// %s\n", line);
- TString* tempStr = new TString();
+ TString* tempStr = new TString(fTextIncludes->GetText());
// Add include files:
// Remove white-spaces and replace commas
- tempStr->Append(fTextIncludes->GetText());
tempStr->ReplaceAll(" ", "");
tempStr->ReplaceAll(",","\n#include ");
// If there are files, add the first "#include " in front
if (!useGivenType)
{
typeStr->Clear();
- typeStr->Append("TObject");
+ (*typeStr)="TObject";
}
if (!useGivenType2)
{
typeStr2->Clear();
- typeStr2->Append("TObject");
+ (*typeStr2)="TObject";
}
switch(type){
case AliEveListAnalyser::kSingleObjectSelect:
// Use "Bool_t 'NAME'(const 'OBJECTTYPE' *object)\n"
tempStr->Append("Bool_t ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
case AliEveListAnalyser::kCorrelObjectSelect:
// Use "Bool_t 'NAME'(const 'OBJECTTYPE' *object, const 'OBJECTTYPE2' *object2)\n"
tempStr->Append("Bool_t ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object, const ").Append(typeStr2->Data()).Append(" *object2)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
case AliEveListAnalyser::kSingleObjectAnalyse:
// Use "void 'NAME'(const 'OBJECTTYPE' *object, Double_t*& r, Int_t& n)\n"
tempStr->Append("void ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object, Double_t*& r, Int_t& n)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
case AliEveListAnalyser::kSingleObjectHisto:
// Use "TH1* 'NAME'(const 'OBJECTTYPE' *object)\n"
tempStr->Append("TH1* ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
case AliEveListAnalyser::kCorrelObjectAnalyse:
// Use "void 'NAME'(const 'OBJECTTYPE' *object, const 'OBJECTTYPE2' *object2, Double_t*& r, Int_t& n)\n"
tempStr->Append("void ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object, const ").Append(typeStr2->Data()).Append(" *object2, Double_t*& r, Int_t& n)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
case AliEveListAnalyser::kCorrelObjectHisto:
// Use "TH1* 'NAME'(const 'OBJECTTYPE' *object, const 'OBJECTTYPE2' *object2)\n"
tempStr->Append("TH1* ").Append(name).Append("(const ").Append(typeStr->Data()).Append(" *object, const ").Append(typeStr2->Data()).Append(" *object2)\n");
- fprintf(fp, tempStr->Data());
+ fprintf(fp, "%s", tempStr->Data());
break;
default:
- Error("AliEveGeneralMacroWizard::Create", Form("Unknown type[%d]", type));
+ Error("AliEveGeneralMacroWizard::Create", "Unknown type[%d]", type);
new TGMsgBox(gClient->GetRoot(), GetMainFrame(), "Error",
Form("Unknown type[%d]", type), kMBIconExclamation, kMBOk);
fclose(fp);
gSystem->Exec(Form("rm -f %s.C", name));
tempStr->Clear();
- if (tempStr != 0) delete tempStr;
+ delete tempStr;
tempStr = 0;
typeStr->Clear();
- if (typeStr != 0) delete typeStr;
+ delete typeStr;
typeStr = 0;
return;
}
tempStr->Clear();
- if (tempStr != 0) delete tempStr;
+ delete tempStr;
tempStr = 0;
typeStr->Clear();
- if (typeStr != 0) delete typeStr;
+ delete typeStr;
typeStr = 0;
typeStr2->Clear();
- if (typeStr2 != 0) delete typeStr2;
+ delete typeStr2;
typeStr2 = 0;
fprintf(fp, "{\n%s\n", fGeneralMacroTemplate[type]);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff