Minor changes in macros to check SDD calibration

[u/mrichter/AliRoot.git] / ITS / AliITSMisAligner.cxx

diff --git a/ITS/AliITSMisAligner.cxx b/ITS/AliITSMisAligner.cxx
index 3410108434111c34c1a414c4949bdbe8e61fb3ea..baca8d234d1b8309f962a71dc15151f1aa24b7b2 100644 (file)
--- a/ITS/AliITSMisAligner.cxx
+++ b/ITS/AliITSMisAligner.cxx
@@ -93,58 +93,6 @@ AliITSMisAligner::AliITSMisAligner():
     }
 }
 
-//________________________________________________________________________
-AliITSMisAligner::AliITSMisAligner(const AliITSMisAligner &mAligner):
-    fRnd(mAligner.fRnd),
-    fInd(0),
-    fAlignObjArray(mAligner.fAlignObjArray),
-    fStrSPD("ITS/SPD"),
-    fStrSDD("ITS/SDD"),
-    fStrSSD("ITS/SSD"),
-    fStrStave("/Stave"),
-    fStrHalfStave("/HalfStave"),
-    fStrLadder("/Ladder"),
-    fStrSector("/Sector"),
-    fStrSensor("/Sensor"),
-    fUnifSPDSector(kFALSE),
-    fUnifSPDHS(kFALSE),
-    fUnifSDDLadder(kFALSE),
-    fUnifSSDLadder(kFALSE),
-    fUnifSPDLadder(kFALSE),
-    fUnifSDDModule(kFALSE),
-    fUnifSSDModule(kFALSE)
-{
-    //
-    // copy constructor
-    //
-}
-
-//________________________________________________________________________
-AliITSMisAligner &AliITSMisAligner::operator= (const AliITSMisAligner &mAligner)
-{
-    //
-    // assignment operator
-    //
-    fRnd = mAligner.fRnd;
-    fInd = 0;
-    fAlignObjArray = mAligner.fAlignObjArray;
-    fStrSPD = "ITS/SPD";
-    fStrSDD = "ITS/SDD";
-    fStrSSD = "ITS/SSD";
-    fStrStave = "/Stave";
-    fStrHalfStave = "/HalfStave";
-    fStrLadder = "/Ladder";
-    fStrSector = "/Sector";
-    fStrSensor = "/Sensor";
-    fUnifSPDSector = mAligner.fUnifSPDSector;
-    fUnifSPDHS = kFALSE;
-    fUnifSDDLadder = kFALSE;
-    fUnifSSDLadder = kFALSE;
-    fUnifSPDLadder = kFALSE;
-    fUnifSDDModule = kFALSE;
-    fUnifSSDModule = kFALSE;
-    return (*this);
-}
 
 //_______________________________________________________________________________________
 TClonesArray* AliITSMisAligner::MakeAlObjsArray() {
@@ -167,8 +115,8 @@ TClonesArray* AliITSMisAligner::MakeAlObjsArray() {
     }else{
        Printf("survey array contains %d entries", surveyArray->GetEntriesFast());
     }
-
-    AddAlignObj("ITS",fWholeITS[0],fWholeITS[1],fWholeITS[2],fWholeITS[3],fWholeITS[4],fWholeITS[5],"fixed");
+    char strtemp[5]="ITS";
+    AddAlignObj(strtemp,fWholeITS[0],fWholeITS[1],fWholeITS[2],fWholeITS[3],fWholeITS[4],fWholeITS[5],"fixed");
 
     AddSectorAlignObj(1,5,fSPDSector[0],fSPDSector[1],fSPDSector[2],fSPDSector[3],fSPDSector[4],fSPDSector[5],
            fSPDLadderShiftT[0],fSPDLadderShiftT[1],fSPDLadderShiftT[2],fSPDLadderShiftT[3],fSPDLadderShiftT[4],fSPDLadderShiftT[5],fUnifSPDSector);
@@ -191,7 +139,7 @@ TClonesArray* AliITSMisAligner::MakeAlObjsArray() {
     // all SSD ladders as from survey, + shift and smearing in the "residual" and "full" case
     for(Int_t ii=0; ii<surveyArray->GetEntriesFast(); ii++)
     {
-       AliAlignObjParams* aop = dynamic_cast<AliAlignObjParams*> (surveyArray->UncheckedAt(ii));
+       AliAlignObjParams* aop = static_cast<AliAlignObjParams*> (surveyArray->UncheckedAt(ii));
        TString sName(aop->GetSymName());
 
        if(sName.Contains("SSD") && !sName.Contains("Sensor"))
@@ -228,7 +176,7 @@ TClonesArray* AliITSMisAligner::MakeAlObjsArray() {
     // all SSD modules
     for(Int_t ii=0; ii<surveyArray->GetEntriesFast(); ii++)
     {
-       AliAlignObjParams* aop = dynamic_cast<AliAlignObjParams*> (surveyArray->UncheckedAt(ii));
+       AliAlignObjParams* aop = static_cast<AliAlignObjParams*> (surveyArray->UncheckedAt(ii));
        TString sName(aop->GetSymName());
        if(sName.Contains("SSD") && sName.Contains("Sensor"))
        {
@@ -637,7 +585,7 @@ Bool_t AliITSMisAligner::AddAlignObj(char* name,Double_t dx,Double_t dy,Double_t
        vtheta=dtheta;
        vphi=dphi;
     }else{
-       AliFatal(Form("Invalid string \"%s\" specifying the misalignment type for the volume \"%s\""));
+      AliFatal(Form("Invalid string \"%s\" specifying the misalignment type for the volume \"%s\"",sdistrib.Data(),name));
     }
 
     new((*fAlignObjArray)[fInd]) AliAlignObjParams(name,0,vx,vy,vz,vpsi,vtheta,vphi,kFALSE);