Update of DCS aliases

diff --git a/AD/AliADDataDCS.cxx b/AD/AliADDataDCS.cxx
index ca7e0218e88556a7bfbe1f41832f897d324796da..742aa0f325e2d8fb2433e6cfba2fa1049b766a76 100644 (file)
--- a/AD/AliADDataDCS.cxx
+++ b/AD/AliADDataDCS.cxx
@@ -193,47 +193,37 @@ void AliADDataDCS::Init(){
   TString sindex;
   int iAlias = 0;
   
-  for(int iSide = 0; iSide<2 ; iSide++){
-       for(int iRing = 0; iRing<4 ; iRing++){
-               for(int iSector = 0; iSector<2 ; iSector++){
-                       if(iSide == 0) fAliasNames[iAlias] = "AD0/HV/V0A/SECTOR";
-                       else fAliasNames[iAlias] = "AD0/HV/V0C/SECTOR";
-                       sindex.Form("%d/RING%d",iSector,iRing);
-                       fAliasNames[iAlias] += sindex;
+  for(int iPM = 0; iPM<16 ; iPM++){
+               fAliasNames[iAlias] = Form("AD0/HV/PM%d",iPM);
                        
-                       fHv[iAlias] = new TH1F(fAliasNames[iAlias].Data(),fAliasNames[iAlias].Data(), 3000, kHvMin, kHvMax);
-                       fHv[iAlias]->GetXaxis()->SetTitle("Hv");
-                       iAlias++;
-               }
-       }
+               fHv[iAlias] = new TH1F(fAliasNames[iAlias].Data(),fAliasNames[iAlias].Data(), 3000, kHvMin, kHvMax);
+               fHv[iAlias]->GetXaxis()->SetTitle("Hv");
+               iAlias++;
   }
-
- // Time Resolution Parameters
-       
-       for(int iCIU = 0; iCIU<2 ; iCIU++){
+ // Time Resolution Parameters 
+  for(int iCIU = 0; iCIU<2 ; iCIU++){
                fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/TimeResolution",iCIU);
                fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/WidthResolution",iCIU);
-       }
-
-       // HPTDC parameters
-       for(int iCIU = 0; iCIU<2 ; iCIU++){
-         fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/MatchWindow",iCIU);
-         fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/SearchWindow",iCIU);
-         fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/TriggerCountOffset",iCIU);
-         fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/RollOver",iCIU);
-       }
+  }
+  // HPTDC parameters
+  for(int iCIU = 0; iCIU<2 ; iCIU++){
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/MatchWindow",iCIU);
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/SearchWindow",iCIU);
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/TriggerCountOffset",iCIU);
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/RollOver",iCIU);
+  }
 
-       for(int iCIU = 0; iCIU<2 ; iCIU++){
+  for(int iCIU = 0; iCIU<2 ; iCIU++){
          for(int iCh=1;iCh<=8;iCh++){
-           fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/DelayHit%d",iCIU,iCh);
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/DelayHit%d",iCIU,iCh);
          }
-       }
+  }
 
-       for(int iCIU = 0; iCIU<2 ; iCIU++){
+  for(int iCIU = 0; iCIU<2 ; iCIU++){
          for(int iCh=1;iCh<=8;iCh++){
-           fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/DiscriThr%d",iCIU,iCh);
+               fAliasNames[iAlias++] = Form("AD0/FEE/CIU%d/DiscriThr%d",iCIU,iCh);
          }
-       }
+  }
 
   if(iAlias!=kNAliases) 
              AliError(Form("Number of DCS Aliases defined not correct"));
@@ -277,27 +267,13 @@ void AliADDataDCS::Draw(const Option_t* /*option*/)
 
   if(fGraphs.GetEntries()==0)  return;
   
-  TString canvasName;
-  TCanvas *cHV[8];
+  TCanvas *cHV = new TCanvas("AD0_HV","AD0_HV");
+  cHV->Divide(4,4);
   
-  for(int iSide = 0 ;iSide<2;iSide++){
-       for(int iRing=0;iRing<4;iRing++){
-               if(iSide == 0)  canvasName = "V0A_Ring";
-               else  canvasName = "V0C_Ring";
-               canvasName += iRing;
-               int iCanvas = iSide*4 + iRing;
-               cHV[iCanvas] = new TCanvas(canvasName,canvasName);
-               cHV[iCanvas]->Divide(3,3);
-               for(int iSector=0;iSector<2;iSector++){
-                       cHV[iCanvas]->cd(iSector+1);
-                       int iChannel = iSide*8 + iRing*2 + iSector; 
-                       ((TGraph*) fGraphs.UncheckedAt(iChannel))->SetMarkerStyle(20);
-                       ((TGraph*) fGraphs.UncheckedAt(iChannel))->Draw("ALP");
-
-               }
-                               
+  for(int iPM = 0; iPM<16 ; iPM++){
+       cHV->cd(iPM+1);
+       ((TGraph*) fGraphs.UncheckedAt(iPM))->SetMarkerStyle(20);
+       ((TGraph*) fGraphs.UncheckedAt(iPM))->Draw("ALP");                      
        }
-  }
-
 }
 

diff --git a/AD/macros/DCSValues.txt b/AD/macros/DCSValues.txt
index 1530eebcbd136f02f0bb619fc0ad051f351efa76..3e2ec64f4b379fc33860b3ff1c1ef01fb24889f7 100644 (file)
--- a/AD/macros/DCSValues.txt
+++ b/AD/macros/DCSValues.txt
@@ -1,19 +1,19 @@
-AD0/HV/V0A/SECTOR0/RING0        1784
-AD0/HV/V0A/SECTOR0/RING1        1813
-AD0/HV/V0A/SECTOR0/RING2        1738
-AD0/HV/V0A/SECTOR0/RING3        1855
-AD0/HV/V0A/SECTOR1/RING0        1872
-AD0/HV/V0A/SECTOR1/RING1        1734
-AD0/HV/V0A/SECTOR1/RING2        1490
-AD0/HV/V0A/SECTOR1/RING3        1897
-AD0/HV/V0C/SECTOR0/RING0        1882
-AD0/HV/V0C/SECTOR0/RING1        1901
-AD0/HV/V0C/SECTOR0/RING2        1878
-AD0/HV/V0C/SECTOR0/RING3        1787
-AD0/HV/V0C/SECTOR1/RING0        1893
-AD0/HV/V0C/SECTOR1/RING1        1682
-AD0/HV/V0C/SECTOR1/RING2        1958
-AD0/HV/V0C/SECTOR1/RING3        1718
+AD0/HV/PM0        1784
+AD0/HV/PM1        1813
+AD0/HV/PM2        1738
+AD0/HV/PM3        1855
+AD0/HV/PM4        200
+AD0/HV/PM5        1734
+AD0/HV/PM6        1490
+AD0/HV/PM7        1897
+AD0/HV/PM8        1882
+AD0/HV/PM9        1901
+AD0/HV/PM10        1878
+AD0/HV/PM11        1787
+AD0/HV/PM12        100
+AD0/HV/PM13        1682
+AD0/HV/PM14        1958
+AD0/HV/PM15        1718
 AD0/FEE/CIU0/TimeResolution 2
 AD0/FEE/CIU0/WidthResolution 8
 AD0/FEE/CIU0/MatchWindow 4