#include "AliTRDCalChamberStatus.h"
#include "AliTRDCalSingleChamberStatus.h"
#include "AliTRDCalPadStatus.h"
-#include "AliTRDCalDCS.h"
-#include "AliTRDCalDCSFEE.h"
+#include "AliTRDCalDCSv2.h"
+#include "AliTRDCalDCSFEEv2.h"
#include "AliTRDcalibDB.h"
#include "AliCDBManager.h"
#include "AliCDBStorage.h"
}
//_____________________________________________________________________________
-AliTRDCalibViewer& AliTRDCalibViewer::operator=(const AliTRDCalibViewer& param) {
+AliTRDCalibViewer& AliTRDCalibViewer::operator=(const AliTRDCalibViewer& param)
+{
//
// assignment operator
//
+
+ if (this == ¶m) {
+ return *this;
+ }
+
fTree = param.fTree;
fTreeMustBeDeleted = param.fTreeMustBeDeleted;
fListOfObjectsToBeDeleted = param.fListOfObjectsToBeDeleted;
fAbbreviation = param.fAbbreviation;
fAppendString = param.fAppendString;
+
return(*this);
+
}
//_____________________________________________________________________________
for (Int_t i = 0; i < nNorm; i++) {
normLengths[i] = ((TObjString*)listOfNormalizationVariables->At(i))->String().Length();
}
- Int_t *varSort = new Int_t[nVariables];
+ Int_t *varSort = new Int_t[nVariables+1];
TMath::Sort(nVariables, varLengths, varSort, kTRUE);
- Int_t *normSort = new Int_t[nNorm];
+ Int_t *normSort = new Int_t[nNorm+1];
TMath::Sort(nNorm, normLengths, normSort, kTRUE);
for (Int_t ivar = 0; ivar < nVariables; ivar++) {
str.ReplaceAll(removeString, "");
if (printDrawCommand) std::cout << "The string looks now like: " << str.Data() << std::endl;
- delete varSort;
- delete normSort;
+ delete [] varSort;
+ delete [] normSort;
return str.Data();
}
// encoded with the following format:
// Layer%dSector%dStack%d
- sscanf(trdString.Data(), "Layer%dSector%dStack%d", &layerNo, §orNo, &stackNo);
+ //sscanf(trdString.Data(), "Layer%1dSector%02dStack%1d", &layerNo, §orNo, &stackNo);
+
+ // Coverity compliant solution (bit more cumbersome, but works) CBL
+ TString cName = trdString.Data();
+ Char_t cLayer[2];
+ Char_t cSector[3];
+ Char_t cStack[2];
+
+ cLayer[0] = cName[5];
+ cLayer[1] = 0;
+ cSector[0] = cName[12];
+ cSector[1] = cName[13];
+ cSector[2] = 0;
+ cStack[0] = cName[19];
+ cStack[1] = 0;
+
+ layerNo = atoi(cLayer);
+ sectorNo = atoi(cSector);
+ stackNo = atoi(cStack);
return;
}
Int_t stackNo = (chamber%30)/6;
Int_t layerNo = (chamber%30)%6;
char sectorChr[22];
- sprintf(sectorChr, "Layer%iSector%iStack%i", layerNo, superModuleNo, stackNo);
+ snprintf(sectorChr,22, "Layer%iSector%iStack%i", layerNo, superModuleNo, stackNo);
return EasyDraw(drawCommand, sectorChr, cuts, drawOptions, writeDrawCommand);
}
Error("EasyDraw","The TRD contains only chamber from 0 to 539");
Int_t stackNo = (chamber%30)/6;
Int_t layerNo = (chamber%30)%6;
char sectorChr[22];
- sprintf(sectorChr, "Layer%iSector%iStack%i", layerNo, superModuleNo, stackNo);
+ snprintf(sectorChr,22, "Layer%iSector%iStack%i", layerNo, superModuleNo, stackNo);
return EasyDraw1D(drawCommand, sectorChr, cuts, drawOptions, writeDrawCommand);
}
Error("EasyDraw1D","The TRD contains only chambers from 0 to 539");
dcsArray = (TObjArray*)entry->GetObject();
}
}
- AliTRDCalDCS *dcsSOR = 0;
- AliTRDCalDCS *dcsEOR = 0;
+ AliTRDCalDCSv2 *dcsSOR = 0;
+ AliTRDCalDCSv2 *dcsEOR = 0;
if(getDCS && dcsArray) {
- dcsSOR = (AliTRDCalDCS*)dcsArray->At(0);
- dcsEOR = (AliTRDCalDCS*)dcsArray->At(1);
+ dcsSOR = (AliTRDCalDCSv2*)dcsArray->At(0);
+ dcsEOR = (AliTRDCalDCSv2*)dcsArray->At(1);
}
// Alignment information
} // end if(getCalibs)
// get the dcs information
- AliTRDCalDCSFEE *dcsfeeSOR = 0;
- AliTRDCalDCSFEE *dcsfeeEOR = 0;
+ AliTRDCalDCSFEEv2 *dcsfeeSOR = 0;
+ AliTRDCalDCSFEEv2 *dcsfeeEOR = 0;
if(getDCS) {
if(dcsSOR) dcsfeeSOR = dcsSOR->GetCalDCSFEEObj(chamberNo);
if(dcsEOR) dcsfeeEOR = dcsEOR->GetCalDCSFEEObj(chamberNo);