From c630de475d6f95edadb68b5fb6af3ef4962592a3 Mon Sep 17 00:00:00 2001 From: coppedis Date: Fri, 26 Sep 2008 12:37:29 +0000 Subject: [PATCH] Updates following the changes in ZDCLASERda.cxx --- ZDC/AliZDCDataDCS.cxx | 2 +- ZDC/AliZDCLaserCalib.cxx | 44 +++++++++--------- ZDC/AliZDCLaserCalib.h | 27 ++++++----- ZDC/AliZDCPreprocessor.cxx | 33 ++++++------- .../LaserCalib/Run0_999999999_v0_s0.root | Bin 2716 -> 2782 bytes 5 files changed, 49 insertions(+), 57 deletions(-) diff --git a/ZDC/AliZDCDataDCS.cxx b/ZDC/AliZDCDataDCS.cxx index f44f3bbc7c1..ac309a3c6f4 100644 --- a/ZDC/AliZDCDataDCS.cxx +++ b/ZDC/AliZDCDataDCS.cxx @@ -73,7 +73,7 @@ void AliZDCDataDCS::ProcessData(TMap& aliasMap) } Introduce(j, aliasArr); - if(aliasArr->GetEntries()GetEntries()<=2){ AliError(Form("Alias %s has just %d entries!", fAliasNames[j].Data(),aliasArr->GetEntries())); continue; diff --git a/ZDC/AliZDCLaserCalib.cxx b/ZDC/AliZDCLaserCalib.cxx index da2507db66b..99294728362 100644 --- a/ZDC/AliZDCLaserCalib.cxx +++ b/ZDC/AliZDCLaserCalib.cxx @@ -41,11 +41,11 @@ TNamed() SetName(namst.Data()); SetTitle(namst.Data()); Reset(); - for(Int_t i=0; i<4; i++){ + for(Int_t i=0; i<22; i++){ + fDetector[i] = 0; fSector[i] = 0; - fGain[i] = 0; - fPMRefValue[i] = 0.; - fPMRefWidth[i] = 0.; + fPMValue[i] = 0.; + fPMWidth[i] = 0.; } @@ -59,11 +59,11 @@ AliZDCLaserCalib::AliZDCLaserCalib(const AliZDCLaserCalib& calibda) : SetName(calibda.GetName()); SetTitle(calibda.GetName()); Reset(); - for(int t=0; t<2; t++){ - fSector[t] = calibda.GetSector(t); - fGain[t] = calibda.GetGain(t); - fPMRefValue[t] = calibda.GetPMRefValue(t); - fPMRefWidth[t] = calibda.GetPMRefWidth(t); + for(int t=0; t<22; t++){ + fDetector[t] = calibda.GetDetector(t); + fSector[t] = calibda.GetSector(t); + fPMValue[t] = calibda.GetPMValue(t); + fPMWidth[t] = calibda.GetPMWidth(t); } } @@ -74,11 +74,11 @@ AliZDCLaserCalib &AliZDCLaserCalib::operator =(const AliZDCLaserCalib& calibda) SetName(calibda.GetName()); SetTitle(calibda.GetName()); Reset(); - for(int t=0; t<4; t++){ - fSector[t] = calibda.GetSector(t); - fGain[t] = calibda.GetGain(t); - fPMRefValue[t] = calibda.GetPMRefValue(t); - fPMRefWidth[t] = calibda.GetPMRefWidth(t); + for(int t=0; t<22; t++){ + fDetector[t] = calibda.GetDetector(t); + fSector[t] = calibda.GetSector(t); + fPMValue[t] = calibda.GetPMValue(t); + fPMWidth[t] = calibda.GetPMWidth(t); } return *this; @@ -93,10 +93,10 @@ AliZDCLaserCalib::~AliZDCLaserCalib() void AliZDCLaserCalib::Reset() { // Reset - memset(fSector,0,4*sizeof(Float_t)); - memset(fGain,0,4*sizeof(Float_t)); - memset(fPMRefValue,0,4*sizeof(Float_t)); - memset(fPMRefWidth,0,4*sizeof(Float_t)); + memset(fDetector,0,22*sizeof(Float_t)); + memset(fSector,0,22*sizeof(Float_t)); + memset(fPMValue,0,22*sizeof(Float_t)); + memset(fPMWidth,0,22*sizeof(Float_t)); } @@ -105,11 +105,9 @@ void AliZDCLaserCalib::Print(Option_t *) const { // Printing of calibration object printf("\n\n ******************* AliZDCLaserCalib object *******************\n"); - for(Int_t i=0; i<4; i++){ - if(fSector[i]==1.) printf(" side C ->"); - else if(fSector[i]==4.) printf(" side A->"); - printf(" Gain chain %1.0f",fGain[i]); - printf(" PMRefValue = %1.0f PMRefWidth = %1.0f\n",fPMRefValue[i],fPMRefWidth[i]); + for(Int_t i=0; i<22; i++){ + printf(" Detector %d, sector %d, PMValue = %1.1f +/- %1.1f\n", + fDetector[i], fSector[i],fPMValue[i],fPMWidth[i]); } printf(" ***************************************************************\n\n"); } diff --git a/ZDC/AliZDCLaserCalib.h b/ZDC/AliZDCLaserCalib.h index 472f3602882..7e2027f8f50 100644 --- a/ZDC/AliZDCLaserCalib.h +++ b/ZDC/AliZDCLaserCalib.h @@ -26,24 +26,23 @@ class AliZDCLaserCalib: public TNamed { void Reset(); virtual void Print(Option_t *) const; // - Float_t GetSector(Int_t i) const {return fSector[i];} - Float_t GetGain(Int_t i) const {return fGain[i];} - Float_t GetPMRefValue(Int_t i) const {return fPMRefValue[i];} - Float_t GetPMRefWidth(Int_t i) const {return fPMRefWidth[i];} + Int_t GetDetector(Int_t i) const {return fDetector[i];} + Int_t GetSector(Int_t i) const {return fSector[i];} + Float_t GetPMValue(Int_t i) const {return fPMValue[i];} + Float_t GetPMWidth(Int_t i) const {return fPMWidth[i];} - void SetSector(Int_t i, Float_t ival) {fSector[i] = ival;} - void SetGain(Int_t i, Float_t ival) {fGain[i] = ival;} - void SetfPMRefValue(Int_t i, Float_t ival){fPMRefValue[i] = ival;} - void SetfPMRefWidth(Int_t i, Float_t ival){fPMRefWidth[i] = ival;} + void SetDetector(Int_t i, Int_t ival) {fDetector[i] = ival;} + void SetSector(Int_t i, Int_t ival) {fSector[i] = ival;} + void SetfPMValue(Int_t i, Float_t ival) {fPMValue[i] = ival;} + void SetfPMWidth(Int_t i, Float_t ival) {fPMWidth[i] = ival;} protected: - // 2 reference ch. x 2 gain chain - Float_t fSector[4]; // sector fSector=1(side C), 4(sideA) - Float_t fGain[4]; // fGain=0 (high gain chain), 1 (low gain chain) - Float_t fPMRefValue[4]; // ADC spectrum mean value - Float_t fPMRefWidth[4]; // ADC spectrum width + Int_t fDetector[22];// detector code + Int_t fSector[22]; // sector in detector (=5 for reference PMs) + Float_t fPMValue[22]; // ADC spectrum mean value + Float_t fPMWidth[22]; // ADC spectrum width // - ClassDef(AliZDCLaserCalib,2) // ZDC LASER calibration data + ClassDef(AliZDCLaserCalib,3) // ZDC LASER calibration data }; #endif diff --git a/ZDC/AliZDCPreprocessor.cxx b/ZDC/AliZDCPreprocessor.cxx index f924b8bc938..c44776c70e2 100644 --- a/ZDC/AliZDCPreprocessor.cxx +++ b/ZDC/AliZDCPreprocessor.cxx @@ -178,7 +178,8 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap) // *************** From DCS ****************** // Fills data into a AliZDCDataDCS object if(!dcsAliasMap) return 1; - + printf("Processing data from DCS\n"); + // The processing of the DCS input data is forwarded to AliZDCDataDCS Float_t dcsValues[28]; // DCSAliases=28 fData->SetCalibData(dcsValues); @@ -189,8 +190,8 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap) metadata.SetComment("DCS data for ZDC"); Bool_t resDCSRef = kTRUE; resDCSRef = StoreReferenceData("DCS","Data",fData,&metadata); - //dcsAliasMap->Print(""); - // + dcsAliasMap->Print(""); + // --- Writing ZDC table positions into alignment object TClonesArray *array = new TClonesArray("AliAlignObjParams",10); TClonesArray &alobj = *array; @@ -202,7 +203,8 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap) Double_t dyZN2 = (Double_t) (dcsValues[2]/10.); Double_t dyZP2 = (Double_t) (dcsValues[3]/10.); // - const char *n1ZDC="ZDC/NeutronZDC_C"; + + const char *n1ZDC="ZDC/NeutronZDC_C"; const char *p1ZDC="ZDC/ProtonZDC_C"; const char *n2ZDC="ZDC/NeutronZDC_A"; const char *p2ZDC="ZDC/ProtonZDC_A"; @@ -215,6 +217,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap) new(alobj[1]) AliAlignObjParams(p1ZDC, volid, dx, dyZP1, dz, dpsi, dtheta, dphi, kTRUE); new(alobj[2]) AliAlignObjParams(n2ZDC, volid, dx, dyZN2, dz, dpsi, dtheta, dphi, kTRUE); new(alobj[3]) AliAlignObjParams(p2ZDC, volid, dx, dyZP2, dz, dpsi, dtheta, dphi, kTRUE); + // save in CDB storage AliCDBMetaData md; md.SetResponsible("Chiara Oppedisano"); @@ -371,24 +374,16 @@ else if(runType=="STANDALONE_LASER"){ } Log(Form("File %s connected to process data from LASER events", laserFileName)); // - Float_t ivalRead[4][2]; - for(Int_t j=0; j<4; j++){ - for(Int_t k=0; k<2; k++){ + Float_t ivalRead[22][4]; + for(Int_t j=0; j<22; j++){ + for(Int_t k=0; k<4; k++){ fscanf(file,"%f",&ivalRead[j][k]); //printf(" %d %1.0f ",k, ivalRead[j][k]); } - if(j==0 || j==1){ - lCalib->SetGain(j, 0); - if(j==0) lCalib->SetSector(j, 1); - else lCalib->SetSector(j, 4); - } - else if(j==2 || j==3){ - lCalib->SetGain(j, 1); - if(j==2) lCalib->SetSector(j, 1); - else lCalib->SetSector(j, 4); - } - lCalib->SetfPMRefValue(j, ivalRead[j][0]); - lCalib->SetfPMRefWidth(j, ivalRead[j][1]); + lCalib->SetDetector(j, ivalRead[j][0]); + lCalib->SetSector(j, ivalRead[j][1]); + lCalib->SetfPMValue(j, ivalRead[j][2]); + lCalib->SetfPMWidth(j, ivalRead[j][3]); } fclose(file); } diff --git a/ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root b/ZDC/Calib/LaserCalib/Run0_999999999_v0_s0.root index 66925126748805e29adae9ecf2bdaea733be10f9..cb68bd87f48c45208f5b5a2d76e0f1045bceb389 100644 GIT binary patch delta 2209 zcmZWrc{mi_8lJ(}cPYydMPx{f5XKTSWQk;uk$s!Y*u%9nMYe>-7BSg|@S_Q1OO`CD zER&F}j5XUJ%TL#Shu?Gmx%WKJd(QWq^M3Ci-}gM{{c;5-1$6>^eS-jio)`cC;06G& zPtsvVkMVQ>=~!d>Ctzd)0GML|K=M}^aAG&#&qqMN8+{*I*717M+;pZK;DlGC8nncP z512KiA15LGs^vt34!ZWqVoUjdiGN=Hy92{dq!>z1^3!sGvN#g3Tp>~Kh6*u1e@@7ct6%s0kyqH6!A-k0FZU{4G*3zO&h5(50-yV zygyG~kHolIth#@tQQ}4`I|+#G(Fxx_F1ehJE#L3;a_X3`>*L{vHy5R}%}mm=zP%l; zLoxnITUtVSdmspc@G$JcrM!Sbn)sM}&2Cb_;eCxp6OwW7s&k_~bmtjLur=3CR^Nx`ogLG zGlWhdHAaF{0HJR+>T?G(t%~*{nc$@5RWWRl+=!}fjKE`Olbxenk!A0vnZm||MX7(-~5dfpHS8H%FikwG8C6~^OxTYWF?uPM4 zO$)6;dgENlihE+vD7GeAR?L;+mcfK_VgVt8Im~$2X;e;h`kSAqS#n{8R^r2+YMC!W zRYobBmhm=Q%Ff5R$fX9s4(w(w)jwOYMFJ&-J9ZvY=xJdsske<|c}I+V<}f^mMy6Ff z5G(Tx_wl&CENM?{uQMF~O%}Zp%j?}a`*x5&OzlWjDKy@&Zc|cq<{|gzfh7Q(fE4(DL4^%l1qjxtgm5)vVmX zT^5mlGng0RZvR>*)t?a0-qo``*FlXD<{Lu`KzPTNaAMbmO-JWHJ(Q`NXGd!cz|cJ= zSa(f^QIfA zp@5{148+_e2REoLg1B&7Lh}z2lofCDSNNQf-Kuj{<)ng92|CQ68{);vY!LFlyKB)BA4H1K#4$f zolys=gb7B9TC0`Q@(TBH8WDRKA@-Fj)VVRm@+$tRUe>gSKi(<7$Qnp#SN?;gfGcP3 zOihWZyOvH=$Kt(V<5Qh`*~BFSU!%j#@`w8h;7UOXhwHM019(PeVu}YBUF!ZZ^uC?+ z&=)&6X_$d9*=?gwbxK;a(T&dbtrgw)sEXDQ54R-QAe#}D)$1Qz3i_fKz@pjncQ-gP zK@H{~eu-8zYlD7AZ4q>TR&x$}B&i0N?H57<&GxN+jYH*Vz$_lMOSb%f=7-^}2k#Gn z1|?P8+Ali83v?!8K_$3bO#Kp$1`rpGTB7wiSVz;`-R{Ex#+r*W`zaGXpFr%ZM; NIx`qF8FDQh@E;!z@bv%y delta 2156 zcmZWrc{J4P8=t8LG1+ReC50IpYZ9)RkTt|b)|v@pizyS?#W%`WqRgP|H5r*G%TU6# zkBcHZ8B54A$i7V1mHQj+`Tg_zz2|)1_c_n=d7pEh=RNQFJmauzn65v85C8&wjsbx{ z?jR6vHV1qho5TT_gXJUt8iz_iAg){xxYZ*iHGnNN_5gfWzq7G!g>)It&tW1#`@B32 ztuaxO|92D4v2Su*b^AFu;N;$4M=kz8#lMmN?%=cgslajj_fxXL^1uuT6bA-{fU#CJ zzD=qpE}1f{5XoQHq)P2^x1wbb$Zh2`Z>%a^{|HI6y}==1VJ>yg`1u~>(vY+nqwGmZ z#7dO_$|%5?VZ?Cf%`P^a9WyT$nRQ_^Ln_G)+_>dJk{sx?{%Tt9_NHw)blCCJp=ssp zh!o(#-Wv*lcjpD#xTZy%h(h=KzH9Wlv2}2jrYw~AoH^?U#H&8gSZ#}z#fRGotxAB& z#$0->7ZFbX;??y*t?Er8wc2-KV$Yly_Pt}A=HbK)4pwckMB>oF<2AT<%UeE`OlD<5 zVC)sgjJSOB23>NKZPY=JIpqr{9kfr6^8|-Mhe}eU4l4n6T%aUjP9Itv&2LK>iSE@} z;tJ+vlxD2oH_*_TCl!(u1ckeU+-i)TkrDK<*S|M0QFwyWN_EYm7KI0M7WrP7=WHXy zm*;4_Okwgw6U1+#4HkdFq4-KF!E>lxOV%12uiA?aLT>>7+?$nJtXSbcb}iaUz2_x0 zptr8-DPVIhR!1{)RHgcvN%}9_U1RQ2jPDiP+SdxVIlih3zO0gDHk&n+ZtgN4XzEfN z7QtjE!OH%Uh7Wykg}GPe{UEroj88;>{pu?I{BeU1tsrJ1*+?1_f9Xn%?dl{thO>6 z2o8UBOg!kZ(-UjCR}r+{u5N;(v48HIBC#7gm7?4O+YHW+U3NAQEg*gR?PsYe@XId@ z;_mYEQT%}O%X+g#j9NUT>4cT|uf#}+Y}Fsv#Q$gtT8xex+GjB76%As8qXF9!kDQA0> z_%2lDHng%k(dIQ$Uj)~38NB=n;4-{lPEMY1w`bULl;u*!*Ttfd}YtOo#-!73XJ(KC8)JpTy zm|V9c4n&M}sJ0e~SrRjrJQo4^W3xl;UDdsu-(Xt5yusV@X_Hm^Ek=BD*z`DRVz?cU z{Oug4&aOz6L62DV92T*E#@p^W$;<2N>8aeU`v}Zv3#A#syVk#^Z+U8|^|R8=;}4_M zdAfsfC-vK-6`VpWJkEM_uELkEO8U9CN{7^;+ru!mP0AwcV)hwbzXO(*dk#N`d31{= zMEn&WF~pu}o~p@o<*BSj$?q*W?gi)Xezw^wmuLf|6=rlPQyZlPTTr}T3O8l)$f{3s zkd*%M0j)3c zpbGz5``|hddzqo;hQ9cAhhcUjv}D*&yEaQDwyx2q$3gGm8$y-DOp;P>0D7B>DJk?% za@wflPKwbG;74gle=eUAQRKV(LOQFYY;Zxi;c@ng;KFMUni{@B5YH6Ais6}+YJ<5p zuB{ZE(eyU*N0k!gFjU}jcyfQ~O2m)j@$Am69t|K7GPP^)<&3kTq}f!_xqR(>^3xYi zt;l0v3PUouJM?E=u5@XJPg%s_(aqC0^f4Ks{YsB_Fe?Fh>Vq;Ca&$PKN|7Sj; z`);%r@P*D>P`>%n5tgARe*Ns)JiIbn|De?%IdV!_KNurK%r^n(FnpUu0^<;@Ph Hm