From 8d786fb830afadee211763332f0fa31fa6acee30 Mon Sep 17 00:00:00 2001 From: cblume Date: Tue, 6 Feb 2007 08:51:30 +0000 Subject: [PATCH] Remove t0 again from global calibration --- TRD/AliTRDcalibDB.cxx | 10 +---- TRD/Cal/AliTRDCalGlobals.cxx | 8 +++- TRD/Cal/AliTRDCalGlobals.h | 6 +-- TRD/Cal/AliTRDCreateDummyCDB.C | 57 ++++++++++++-------------- TRD/Calib/ChamberT0/Run0_0_v0_s0.root | Bin 1406 -> 1403 bytes TRD/Calib/Globals/Run0_0_v0_s0.root | Bin 1656 -> 1618 bytes TRD/Calib/LocalT0/Run0_0_v0_s0.root | Bin 17837 -> 17837 bytes 7 files changed, 34 insertions(+), 47 deletions(-) diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx index 23aa5635f75..082aba5ff11 100644 --- a/TRD/AliTRDcalibDB.cxx +++ b/TRD/AliTRDcalibDB.cxx @@ -382,12 +382,6 @@ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row) // Returns t0 for the given pad. // - const AliTRDCalGlobals *calGlobal = dynamic_cast - (GetCachedCDBObject(kIDGlobals)); - if (!calGlobal) { - return -1; - } - const AliTRDCalPad *calPad = dynamic_cast (GetCachedCDBObject(kIDT0Pad)); if (!calPad) { @@ -405,9 +399,7 @@ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row) return -1; } - return calGlobal->GetT0Offset() - + calChamber->GetValue(det) - + roc->GetValue(col,row); + return calChamber->GetValue(det) + roc->GetValue(col,row); } diff --git a/TRD/Cal/AliTRDCalGlobals.cxx b/TRD/Cal/AliTRDCalGlobals.cxx index b5eada08388..c92c404017d 100644 --- a/TRD/Cal/AliTRDCalGlobals.cxx +++ b/TRD/Cal/AliTRDCalGlobals.cxx @@ -34,7 +34,9 @@ AliTRDCalGlobals::AliTRDCalGlobals() ,fTailCancelationAmp(0) ,fPedestal(0) ,fADCClockphase(0) - ,fT0Offset(0) + ,fConfigID(0) + ,fGainTableID(0) + ,fPretriggerConf(0) { // // AliTRDCalGlobals default constructor @@ -51,7 +53,9 @@ AliTRDCalGlobals::AliTRDCalGlobals(const Text_t *name, const Text_t *title) ,fTailCancelationAmp(0) ,fPedestal(0) ,fADCClockphase(0) - ,fT0Offset(0) + ,fConfigID(0) + ,fGainTableID(0) + ,fPretriggerConf(0) { // // AliTRDCalGlobals constructor diff --git a/TRD/Cal/AliTRDCalGlobals.h b/TRD/Cal/AliTRDCalGlobals.h index ef9b83c0575..3cee21b890f 100644 --- a/TRD/Cal/AliTRDCalGlobals.h +++ b/TRD/Cal/AliTRDCalGlobals.h @@ -29,7 +29,6 @@ class AliTRDCalGlobals : public TNamed { void SetTailCancelationAmp(Int_t amp) { fTailCancelationAmp = amp; } void SetPedestal(Int_t ped) { fPedestal = ped; } void SetADCClockphase(Float_t cp) { fADCClockphase = cp; } - void SetT0Offset(Float_t t0) { fT0Offset = t0; } void SetConfigID(TString id) { fConfigID = id; } void SetGainTableID(TString id) { fGainTableID = id; } void SetPretriggerConf(TString conf) { fPretriggerConf = conf; } @@ -40,7 +39,6 @@ class AliTRDCalGlobals : public TNamed { Int_t GetTailCancelationAmp() const { return fTailCancelationAmp; } Int_t GetPedestal() const { return fPedestal; } Float_t GetADCClockphase() const { return fADCClockphase; } - Float_t GetT0Offset() const { return fT0Offset; } TString GetConfigID() const { return fConfigID; } TString GetGainTableID() const { return fGainTableID; } TString GetPretriggerConf() const { return fPretriggerConf; } @@ -57,13 +55,11 @@ class AliTRDCalGlobals : public TNamed { Float_t fADCClockphase; // ADC clockphase in respect to TTC - Float_t fT0Offset; // Global offset on t0 - TString fConfigID; // Configuration ID TString fGainTableID; // Gain table ID TString fPretriggerConf; // Pretrigger configuration - ClassDef(AliTRDCalGlobals,3) // TRD calibration class for global TRD parameters + ClassDef(AliTRDCalGlobals,4) // TRD calibration class for global TRD parameters }; #endif diff --git a/TRD/Cal/AliTRDCreateDummyCDB.C b/TRD/Cal/AliTRDCreateDummyCDB.C index eec11ae4f2b..c7473439a43 100644 --- a/TRD/Cal/AliTRDCreateDummyCDB.C +++ b/TRD/Cal/AliTRDCreateDummyCDB.C @@ -57,7 +57,7 @@ TObject *CreateDetObject(const char *shortName, const char *description } //_____________________________________________________________________________ -TObject *CreateGlobalsObject(Float_t t0Offset = 0.0) +TObject *CreateGlobalsObject() { AliTRDCalGlobals *object = new AliTRDCalGlobals("Globals" @@ -72,9 +72,6 @@ TObject *CreateGlobalsObject(Float_t t0Offset = 0.0) object->SetPedestal(0); object->SetADCClockphase(0); - // Introduce negative offset to allow for fluctuations around 0 - object->SetT0Offset(-t0Offset); - return object; } @@ -210,8 +207,6 @@ void AliTRDCreateDummyCDB() << "TRD :: Creating dummy CDB with event number " << gkDummyRun << endl; - - Float_t t0Offset = 5.0; AliCDBManager *man = AliCDBManager::Instance(); gStorLoc = man->GetStorage("local://$ALICE_ROOT"); @@ -228,17 +223,17 @@ void AliTRDCreateDummyCDB() metaData = CreateMetaObject("AliTRDCalPad"); - obj = CreatePadObject("LocalVdrift" ,"TRD drift velocities (local variations)",1); - StoreObject("TRD/Calib/LocalVdrift" ,obj,metaData); + //obj = CreatePadObject("LocalVdrift" ,"TRD drift velocities (local variations)",1); + //StoreObject("TRD/Calib/LocalVdrift" ,obj,metaData); - obj = CreatePadObject("LocalT0" ,"T0 (local variations)",0.0); + obj = CreatePadObject("LocalT0" ,"T0 (local variations)",0); StoreObject("TRD/Calib/LocalT0" ,obj,metaData); - obj = CreatePadObject("GainFactor" ,"GainFactor (local variations)",1); - StoreObject("TRD/Calib/LocalGainFactor" ,obj,metaData); + //obj = CreatePadObject("GainFactor" ,"GainFactor (local variations)",1); + //StoreObject("TRD/Calib/LocalGainFactor" ,obj,metaData); - obj = CreatePRFWidthObject(); - StoreObject("TRD/Calib/PRFWidth" ,obj,metaData); + //obj = CreatePRFWidthObject(); + //StoreObject("TRD/Calib/PRFWidth" ,obj,metaData); // // Detector objects @@ -246,45 +241,45 @@ void AliTRDCreateDummyCDB() metaData = CreateMetaObject("AliTRDCalDet"); - obj = CreateDetObject("ChamberVdrift" ,"TRD drift velocities (detector value)", 1.5); - StoreObject("TRD/Calib/ChamberVdrift" ,obj,metaData); + //obj = CreateDetObject("ChamberVdrift" ,"TRD drift velocities (detector value)", 1.5); + //StoreObject("TRD/Calib/ChamberVdrift" ,obj,metaData); - obj = CreateDetObject("ChamberT0" ,"T0 (detector value)",t0Offset); + obj = CreateDetObject("ChamberT0" ,"T0 (detector value)",0); StoreObject("TRD/Calib/ChamberT0" ,obj,metaData); - obj = CreateDetObject("ChamberGainFactor" ,"GainFactor (detector value)", 1); - StoreObject("TRD/Calib/ChamberGainFactor" ,obj,metaData); + //obj = CreateDetObject("ChamberGainFactor" ,"GainFactor (detector value)", 1); + //StoreObject("TRD/Calib/ChamberGainFactor" ,obj,metaData); // // Global object // metaData = CreateMetaObject("AliTRDCalGlobals"); - obj = CreateGlobalsObject(t0Offset); + obj = CreateGlobalsObject(); StoreObject("TRD/Calib/Globals" ,obj,metaData); // // Status objects // - metaData = CreateMetaObject("AliTRDCalChamberStatus"); - obj = CreateChamberStatusObject(); - StoreObject("TRD/Calib/ChamberStatus" ,obj,metaData); + //metaData = CreateMetaObject("AliTRDCalChamberStatus"); + //obj = CreateChamberStatusObject(); + //StoreObject("TRD/Calib/ChamberStatus" ,obj,metaData); - metaData = CreateMetaObject("AliTRDCalPadStatus"); - obj = CreatePadStatusObject(); - StoreObject("TRD/Calib/PadStatus" ,obj,metaData); + //metaData = CreateMetaObject("AliTRDCalPadStatus"); + //obj = CreatePadStatusObject(); + //StoreObject("TRD/Calib/PadStatus" ,obj,metaData); - metaData = CreateMetaObject("AliTRDCalPIDLQ"); - obj = CreatePIDLQObject(); - StoreObject("TRD/Calib/PIDLQ" ,obj,metaData); + //metaData = CreateMetaObject("AliTRDCalPIDLQ"); + //obj = CreatePIDLQObject(); + //StoreObject("TRD/Calib/PIDLQ" ,obj,metaData); // // Monitoring object // - metaData = CreateMetaObject("AliTRDCalMonitoring"); - obj = CreateMonitoringObject(); - StoreObject("TRD/Calib/MonitoringData" ,obj,metaData); + //metaData = CreateMetaObject("AliTRDCalMonitoring"); + //obj = CreateMonitoringObject(); + //StoreObject("TRD/Calib/MonitoringData" ,obj,metaData); } diff --git a/TRD/Calib/ChamberT0/Run0_0_v0_s0.root b/TRD/Calib/ChamberT0/Run0_0_v0_s0.root index bd038e6c608e30930f6673f0e5dd65d04e2a7c5a..87c11a591b1ce3dca416ee958d6e6dc864b778d9 100644 GIT binary patch delta 533 zcmeyz^_$DSC_lf1f#Jjn1_p){1_st@AQl3$Gl7^9i083D7);ZF{HH)6p?MMx7e!CB zPuBR%)VuHfL`OAA28LSv>Zc`fcaF zabQb3{GRjinJJZS_4>=~?%E zv+v7l#)*7w5~Ve(dE&BKZAyZr8G#ZxT)| zG<%`_wm`D(fY$ox=ImHuE$&qKTgl`AO2rzV* y6~UqF019}f>6$0 zxuNlysdwM|iH>T#3=FpzK+38Ox>l)9ESl^Nq(Drd&@_+{Knye*1X$`ZO@PS2NX8hD zQJk+p`X|3-QDuqp;ZT@d%BWP|p-|iS=G~g!Et)DTH~Bv*oqu5V`X|{hQm$uxe5YGK z!?|r{qR_v?(+~b&7P4Do+sEVfe*T)%QPcTd*S%`0@yJs+$#Cvh(7~mT_XM4tlcTA= z^vGn@%BUaL9&KJ_ZFSbnM#t?>^NU6V{QrgFK(N2M^@PToAM6t6%&a#$|KjJD_Gp&p z-?s0JpXNEE>_Ns2&UzJ|y#;4)o2xxNdR4YERAar<>+Jhd0xuIf0*`M$^6A3zlX(rE-Sz z#Lk=ZJn+V>sN66yot9 k0bnQtLwsVLs}PU|^3lT70HG2b)gYBzAa$&D<)%{@0O$b79RL6T diff --git a/TRD/Calib/Globals/Run0_0_v0_s0.root b/TRD/Calib/Globals/Run0_0_v0_s0.root index b5667503fe2912e598dc9375782eb387aa956982..99e207f14800a2f7f288a3c10a1dc5562479bb64 100644 GIT binary patch delta 1216 zcmeytbBV{kC_lf1f#Jjn1_p){1_rhu1_svGKz2G1GXn7}76^l>l!1Zi5l~37>5jui z(G%^HH9j--?t4GcQH_^@;Ti)-S*1bG9Knf2{q8^t!~_aW0T}_rK%+r`H5}6fhzyKm zv<4Z)xD=#+@*7sw`Y0cc{|pRE85t@Va{~@~9WfB_?Oo(9eq?g{N9I#v2W`DdySbY< zHa)0Z6>L30&3ls8Z{2x+SnC7Sv$PTj;(EwnUfb^gJv51%HR zx^FgE=O!HV$n))KJL#8EFWQ}d{rS$avN7Exrn={i&YBC!?h|VSKCP@jQm-*J>)5j9 zw(hsTU3U4oa$UciIA_}Q=Ch|Y6ug=Ix2-Ny&-8wO=%>`3v#V!UcSR%~3HfC>O)dQR z?swt`}C+-C!Z(AFvY^MwsXj>oU_oVty9cZklKdeqz${(QYAmd5EiEn0EX`c=R_4^!3ky~}^4#{`^8CLaufHcve`X)t zSj1B7!(JS7YVUu}&t|1c6&jP=RFV(9u|Boi<#avAcJ5~aHt*LeFLJiuckgEFZ09TU zVsGbs*YZ46es-7KS>G@PF1<6VQtu9j{B)RcGk2Er{?x?hn>Q?Kk8NFlx+BCc+jO>E z_gkKAs~7oht=YP%Qe4nN`DJawi;%$U3*;v^|J&y}|MVj6OD}Z#Gkr>3mP`#%Qe4Cp z#rZZsdsa8gfqK;{t3`Kwd-zW{-rpoM?dchB|CbIr%M@~DW;HSjwqELZA?UX0_WYB1 z`$IUVTwis)VuRR`TsfW>U#I8iGdd)Fp1urAe zcK_86H*HsrkhYXEkW}y4eBz47EUmJO72z|cmUVVyWd!Ta-Vy%0UMT(bf!l9yZwh>} z!)2fC)va$#nRMB))=s1U~ba2nb9eST7__sPKU%GuuwaQTG zx%DwS%NNyRRm$A4)8xV(d)@bO>i9)wOHi zy*MvqQ5sOL`ewcx_Y}FZBNKnt`v?7-_S9VWf6lji;!oOMbTmG5eEI#j&-CBsjoUXh z2yY5nf3@jG{k8iCn~y#)tbeqsLpABbaqXieXKc=gnE&fE*}A6dd((`5?$xvR3EU2Q z;H>?@Y1)2;>_U~$?Sb)9^*qAS@oNIv)21DNF@J^Y&SRon+hsf4{_gmhcFSV(;eGN6Y;N{Gd_08(ZT*#H0l delta 1259 zcmcb_^Ml8}C_lf1f#Jjn1_p){1_rhYAQl9&(}9=~h-a}t7)-Sc49p-Q&k37;PZd43 zd^@av`hp#Dfm*Kw+>H1H%-c=qw-x zOEWOA)?%6n(ue?z&LE>1SAz6U_F&YgXJ=$s$;eQ_m>O`_>xhAXAMYY}@gtMlKQf*Y zOZ>hgWcv<paCFC|tj&7UR)pW0wxZU@hT~+N-4t&<`&XC6?ad4LZ5D+sJ-lE|qk74W0EOo} zfArM9mAAXUD?rc1l;>S#Oy7Osc{Zt5tLA)*_v(`=o7m_gb!dk&bqHJ zh>W=(cz}ud*tP2mO|`6l?r!`XZBno}f@jT~uk$WdbNS7T?ad9DE|b35WcKpNZ8xs4 z+}@V??L*HlRsK^BE2jS6I?F4Qsf1-}slW+#Io4}0Y*meCa-58jF#7cB1Ftwsf;Ko- zfFZ>03l3oiP~bDwPVQ#Xt>4bX;L8pSsjXA?=U;XZIUav!S*B}a*xL)NI~YGMPSS8S zV9+|pzhaX~=xZeb*Mnv6E^+@8yeYmQNY%L0MaD&g&Hz6u!nqlfx4!!3?D9a`v$tVkuv={JJyq_%$<6y>T&A~P zvz&i%#+wfwo{E)DE}>g8wn0UG+0i`PdzW#@p5%WY zRR5NLTa~tc-mKaQufyER!xEKMHxz`Fo4$#6;9eqC@?&NF&-2Cq`W|lgxu-As*-qK4 zvVHj}-ev!7dZyml&$%a_WsdMwx4m*l{+<3Or>Dc#|I<0#P3K{z{C1IG!(y4(yQy1* zPp|r<(Q$XphN_(o=Q-|}GEMLPBl&R6mKKklQ78T-J_)JT>6;NHIr-Yz_lvhJv^Cwb zdhwPj8P1!zX3sXYJ0?Y}nrSNS&|CcVudu21wb;)4N4P6C7lzpzFP-}_usJ3)Bc!x< z)os_%=SR~H6{?r-wz;@zTASYI-g`06ETmqVi&VKT02TvNz$J@0qGVyMoy^GQ0W6|` d2_3C)P@Vjmm75!02C)eORr;`2l$%ar008u*7>fV^ diff --git a/TRD/Calib/LocalT0/Run0_0_v0_s0.root b/TRD/Calib/LocalT0/Run0_0_v0_s0.root index d4534f56c8d63a544d4e95bc39fc74943c575b25..3371b7fdebb46ea60ea5cfc3eacc9e4463a35881 100644 GIT binary patch delta 150 zcmZ46&A7Ikae@JV#sM#f3!*35Cu@9W>fQH#qNAE51H&~276t}}N`sy`0t~SXj6ik@ z5Hn0paCM$|&_Nw243rWCicA6GSwIYyW?*pH1XK(+ak2)ZEHhB;WJOoi&AE)B4nU6J X=A({3m_Url2VCNyvIby&h-)MOVD2rX delta 150 zcmZ46&A7Ikae@Iq;|jLlQ$>$0xuNlysdwM|iH>TL3=G#8SQr=>Dh;|;sWQYeFap^r zK+G^X!PR-