From 19fb06bd74355a33e41b6c9b9c4780c5a8df8b3a Mon Sep 17 00:00:00 2001 From: alla Date: Fri, 7 Nov 2008 12:03:33 +0000 Subject: [PATCH] improved AliT0DataDCS from Tomek --- T0/AliT0DataDCS.cxx | 98 +++++++++++++++++++++---------------------- T0/AliT0DataDCS.h | 42 +++++++++---------- T0/TestPreprocessor.C | 78 +++++++++++++++++++++++++++++++--- 3 files changed, 141 insertions(+), 77 deletions(-) diff --git a/T0/AliT0DataDCS.cxx b/T0/AliT0DataDCS.cxx index 86866f714e2..f43b50c787b 100644 --- a/T0/AliT0DataDCS.cxx +++ b/T0/AliT0DataDCS.cxx @@ -314,9 +314,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_scaler_sec[j]+= aValue->GetUInt(); + t0_scaler_sec[j-kScalers]+= aValue->GetUInt(); } - fScalerSecMean[j] = t0_scaler_sec[j] / aliasEntr[j]; + fScalerSecMean[j-kScalers] = t0_scaler_sec[j-kScalers] / aliasEntr[j]; } else if (j < 2*kScalers+kHV) { @@ -324,9 +324,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_hv_imon[j]+= aValue->GetFloat(); + t0_a_hv_imon[j-2*kScalers]+= aValue->GetFloat(); } - fHViA[j] = t0_a_hv_imon[j] / aliasEntr[j]; + fHViA[j-2*kScalers] = t0_a_hv_imon[j-2*kScalers] / aliasEntr[j]; } else if (j < 2*kScalers+2*kHV) { @@ -334,9 +334,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_hv_vmon[j]+= aValue->GetFloat(); + t0_a_hv_vmon[j-(2*kScalers+kHV)]+= aValue->GetFloat(); } - fHVvA[j] = t0_a_hv_vmon[j] / aliasEntr[j]; + fHVvA[j-(2*kScalers+kHV)] = t0_a_hv_vmon[j-(2*kScalers+kHV)] / aliasEntr[j]; } else if (j < 2*kScalers+2*kHV+kLV) { @@ -344,9 +344,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_lv_imon[j]+= aValue->GetFloat(); + t0_a_lv_imon[j-(2*kScalers+2*kHV)]+= aValue->GetFloat(); } - fLViA[j] = t0_a_lv_imon[j] / aliasEntr[j]; + fLViA[j-(2*kScalers+2*kHV)] = t0_a_lv_imon[j-(2*kScalers+2*kHV)] / aliasEntr[j]; } else if (j < 2*kScalers+2*kHV+2*kLV) { @@ -354,9 +354,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_lv_vmon[j]+= aValue->GetFloat(); + t0_a_lv_vmon[j-(2*kScalers+2*kHV+kLV)]+= aValue->GetFloat(); } - fLVvA[j] = t0_a_lv_vmon[j] / aliasEntr[j]; + fLVvA[j-(2*kScalers+2*kHV+kLV)] = t0_a_lv_vmon[j-(2*kScalers+2*kHV+kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+3*kHV+2*kLV) { @@ -364,9 +364,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_hv_imon[j]+= aValue->GetFloat(); + t0_c_hv_imon[j-(2*kScalers+2*kHV+2*kLV)]+= aValue->GetFloat(); } - fHViC[j] = t0_c_hv_imon[j] / aliasEntr[j]; + fHViC[j-(2*kScalers+2*kHV+2*kLV)] = t0_c_hv_imon[j-(2*kScalers+2*kHV+2*kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+2*kLV) { @@ -374,9 +374,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_hv_vmon[j]+= aValue->GetFloat(); + t0_c_hv_vmon[j-(2*kScalers+3*kHV+2*kLV)]+= aValue->GetFloat(); } - fHVvC[j] = t0_c_hv_vmon[j] / aliasEntr[j]; + fHVvC[j-(2*kScalers+3*kHV+2*kLV)] = t0_c_hv_vmon[j-(2*kScalers+3*kHV+2*kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+3*kLV) { @@ -384,9 +384,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_lv_imon[j]+= aValue->GetFloat(); + t0_c_lv_imon[j-(2*kScalers+4*kHV+2*kLV)]+= aValue->GetFloat(); } - fLViC[j] = t0_c_lv_imon[j] / aliasEntr[j]; + fLViC[j-(2*kScalers+4*kHV+2*kLV)] = t0_c_lv_imon[j-(2*kScalers+4*kHV+2*kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV) { @@ -394,9 +394,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_lv_vmon[j]+= aValue->GetFloat(); + t0_c_lv_vmon[j-(2*kScalers+4*kHV+3*kLV)]+= aValue->GetFloat(); } - fLVvC[j] = t0_c_lv_vmon[j] / aliasEntr[j]; + fLVvC[j-(2*kScalers+4*kHV+3*kLV)] = t0_c_lv_vmon[j-(2*kScalers+4*kHV+3*kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+kCFD) { @@ -404,9 +404,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_cfd_thre[j]+= aValue->GetFloat(); + t0_a_cfd_thre[j-(2*kScalers+4*kHV+4*kLV)]+= aValue->GetFloat(); } - fCFDtA[j] = t0_a_cfd_thre[j] / aliasEntr[j]; + fCFDtA[j-(2*kScalers+4*kHV+4*kLV)] = t0_a_cfd_thre[j-(2*kScalers+4*kHV+4*kLV)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+2*kCFD) { @@ -414,9 +414,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_a_cfd_walk[j]+= aValue->GetFloat(); + t0_a_cfd_walk[j-(2*kScalers+4*kHV+4*kLV+kCFD)]+= aValue->GetFloat(); } - fCFDwA[j] = t0_a_cfd_walk[j] / aliasEntr[j]; + fCFDwA[j-(2*kScalers+4*kHV+4*kLV+kCFD)] = t0_a_cfd_walk[j-(2*kScalers+4*kHV+4*kLV+kCFD)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+3*kCFD) { @@ -424,9 +424,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_cfd_thre[j]+= aValue->GetFloat(); + t0_c_cfd_thre[j-(2*kScalers+4*kHV+4*kLV+2*kCFD)]+= aValue->GetFloat(); } - fCFDtC[j] = t0_c_cfd_thre[j] / aliasEntr[j]; + fCFDtC[j-(2*kScalers+4*kHV+4*kLV+2*kCFD)] = t0_c_cfd_thre[j-(2*kScalers+4*kHV+4*kLV+2*kCFD)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD) { @@ -434,9 +434,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_c_cfd_walk[j]+= aValue->GetFloat(); + t0_c_cfd_walk[j-(2*kScalers+4*kHV+4*kLV+3*kCFD)]+= aValue->GetFloat(); } - fCFDwC[j] = t0_c_cfd_walk[j] / aliasEntr[j]; + fCFDwC[j-(2*kScalers+4*kHV+4*kLV+3*kCFD)] = t0_c_cfd_walk[j-(2*kScalers+4*kHV+4*kLV+3*kCFD)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM) { @@ -444,9 +444,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_ac_trm[j]+= aValue->GetFloat(); + t0_ac_trm[j-(2*kScalers+4*kHV+4*kLV+4*kCFD)]+= aValue->GetFloat(); } - fTRM[j] = t0_ac_trm[j] / aliasEntr[j]; + fTRM[j-(2*kScalers+4*kHV+4*kLV+4*kCFD)] = t0_ac_trm[j-(2*kScalers+4*kHV+4*kLV+4*kCFD)] / aliasEntr[j]; } else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM) { @@ -454,9 +454,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) for(Int_t l=0; l (aliasArr->At(l)); - t0_ac_drm[j]+= aValue->GetFloat(); + t0_ac_drm[j-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)]+= aValue->GetFloat(); } - fDRM[j] = t0_ac_drm[j] / aliasEntr[j]; + fDRM[j-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)] = t0_ac_drm[j-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)] / aliasEntr[j]; } else { @@ -466,11 +466,9 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap) AliDCSValue *aValue=dynamic_cast (aliasArr->At(l)); t0_atten += aValue->GetInt(); } - fTRM[j] = t0_atten / aliasEntr[j]; + fAtten = t0_atten / aliasEntr[j]; } - - - } + } fIsProcessed=kTRUE; return kTRUE; } @@ -490,96 +488,96 @@ void AliT0DataDCS::Init() else if (i < 2*kScalers) { fAliasNames[i] = "t00_ac_scaler_sec_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-kScalers); fAliasNames[i] += sindex; } else if (i < 2*kScalers+kHV) { fAliasNames[i] = "t00_a_hv_imon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-2*kScalers); fAliasNames[i] += sindex; } else if (i < 2*kScalers+2*kHV) { fAliasNames[i] = "t00_a_hv_vmon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+kHV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+2*kHV+kLV) { fAliasNames[i] = "t00_a_lv_imon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+2*kHV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+2*kHV+2*kLV) { fAliasNames[i] = "t00_a_lv_vmon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+2*kHV+kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+3*kHV+2*kLV) { fAliasNames[i] = "t00_c_hv_imon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+2*kHV+2*kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+2*kLV) { fAliasNames[i] = "t00_c_hv_vmon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+3*kHV+2*kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+3*kLV) { fAliasNames[i] = "t00_c_lv_imon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+2*kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV) { fAliasNames[i] = "t00_c_lv_vmon_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+3*kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+kCFD) { fAliasNames[i] = "t00_a_cfd_thre_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+2*kCFD) { fAliasNames[i] = "t00_a_cfd_walk_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+kCFD)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+3*kCFD) { fAliasNames[i] = "t00_c_cfd_thre_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+2*kCFD)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD) { fAliasNames[i] = "t00_c_cfd_walk_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+3*kCFD)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM) { fAliasNames[i] = "t00_ac_trm_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+4*kCFD)); fAliasNames[i] += sindex; } else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM) { fAliasNames[i] = "t00_ac_drm_"; - sindex.Form("%02d",i); + sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)); fAliasNames[i] += sindex; } else { - fAliasNames[i] = "t00_atten"; + fAliasNames[i] = "t00_ac_atten"; } } diff --git a/T0/AliT0DataDCS.h b/T0/AliT0DataDCS.h index 971603b00ed..035de5654d6 100644 --- a/T0/AliT0DataDCS.h +++ b/T0/AliT0DataDCS.h @@ -40,28 +40,28 @@ private: void Init(); void Introduce(UInt_t numAlias, const TObjArray* aliasArr)const; - Int_t fRun; // Run number - UInt_t fStartTime; // Start time - UInt_t fEndTime; // End time - Int_t fStartTimeDCSQuery; // Begin time DCSQuery - Int_t fEndTimeDCSQuery; // End time DCSQuery - Float_t fHViA[kHV]; - Float_t fHVvA[kHV]; - Float_t fLViA[kLV]; - Float_t fLVvA[kLV]; - Float_t fHViC[kHV]; - Float_t fHVvC[kHV]; - Float_t fLViC[kLV]; - Float_t fLVvC[kLV]; - Float_t fCFDtA[kCFD]; - Float_t fCFDwA[kCFD]; - Float_t fCFDtC[kCFD]; - Float_t fCFDwC[kCFD]; + Int_t fRun; // Run number + UInt_t fStartTime; // Start time + UInt_t fEndTime; // End time + Int_t fStartTimeDCSQuery; // Begin time DCSQuery + Int_t fEndTimeDCSQuery; // End time DCSQuery + Float_t fHViA[kHV]; // Mean value of HV current in uA on A-side + Float_t fHVvA[kHV]; // Mean value of HV voltage in V on A-side + Float_t fLViA[kLV]; // Mean value of LV current in uA on A-side + Float_t fLVvA[kLV]; // Mean value of LV voltage in V on A-side + Float_t fHViC[kHV]; // Mean value of HV current in uA on C-side + Float_t fHVvC[kHV]; // Mean value of HV voltage in V on C-side + Float_t fLViC[kLV]; // Mean value of LV current in uA on C-side + Float_t fLVvC[kLV]; // Mean value of LV voltage in V on C-side + Float_t fCFDtA[kCFD]; // Mean threshold on CFD in V on A-side + Float_t fCFDwA[kCFD]; // Mean walk on CFD in V on A-side + Float_t fCFDtC[kCFD]; // Mean threshold on CFD in V on C-side + Float_t fCFDwC[kCFD]; // Mean walk on CFD in V on C-side Float_t fScalerMean[kScalers]; // Mean value of T0 scaler counts from the entire run - Float_t fScalerSecMean[kScalers]; - Float_t fTRM[kTRM]; - Float_t fDRM[kDRM]; - Float_t fAtten; + Float_t fScalerSecMean[kScalers]; // Mean value of T0 scaler counts per second + Float_t fTRM[kTRM]; // Mean temperature on TRM in degrees of Celsius + Float_t fDRM[kDRM]; // Mean temperature on DRM in degrees of Celsius + Float_t fAtten; // Laser amplitude in MIPs TString fAliasNames[kNAliases]; // T0 data points aliases Bool_t fIsProcessed; // status - was processing data successful ClassDef(AliT0DataDCS, 3); diff --git a/T0/TestPreprocessor.C b/T0/TestPreprocessor.C index cf17aa8c25c..55869b72b08 100644 --- a/T0/TestPreprocessor.C +++ b/T0/TestPreprocessor.C @@ -49,16 +49,82 @@ TMap* CreateDCSAliasMap() TMap* aliasMap = new TMap; aliasMap->SetOwner(1); - Int_t n_ac_scalers=32; + TString aliasName; + Int_t n_T0aliases=184; + Int_t nValues=10; - for(int nAlias=0;nAliasSetOwner(1); - - TString aliasName=Form("t00_ac_scaler_%02d",nAlias); - - Int_t nValues=10; + if(nAlias < 32) + { + aliasName=Form("t00_ac_scaler_%02d",nAlias); + } + else if(nAlias < 64) + { + aliasName=Form("t00_ac_scaler_sec_%02d",nAlias); + } + else if(nAlias < 76) + { + aliasName=Form("t00_a_hv_imon_%02d",nAlias); + } + else if(nAlias < 88) + { + aliasName=Form("t00_a_hv_vmon_%02d",nAlias); + } + else if(nAlias < 90) + { + aliasName=Form("t00_a_lv_imon_%02d",nAlias); + } + else if(nAlias < 92) + { + aliasName=Form("t00_a_lv_vmon_%02d",nAlias); + } + else if(nAlias < 104) + { + aliasName=Form("t00_c_hv_imon_%02d",nAlias); + } + else if(nAlias < 116) + { + aliasName=Form("t00_c_hv_vmon_%02d",nAlias); + } + else if(nAlias < 118) + { + aliasName=Form("t00_c_lv_imon_%02d",nAlias); + } + else if(nAlias < 120) + { + aliasName=Form("t00_c_lv_vmon_%02d",nAlias); + } + else if(nAlias < 132) + { + aliasName=Form("t00_a_cfd_thre_%02d",nAlias); + } + else if(nAlias < 144) + { + aliasName=Form("t00_a_cfd_walk_%02d",nAlias); + } + else if(nAlias < 156) + { + aliasName=Form("t00_c_cfd_thre_%02d",nAlias); + } + else if(nAlias < 168) + { + aliasName=Form("t00_c_cfd_walk_%02d",nAlias); + } + else if(nAlias < 178) + { + aliasName=Form("t00_ac_trm_%02d",nAlias); + } + else if(nAlias < 183) + { + aliasName=Form("t00_ac_drm_%02d",nAlias); + } + else + { + aliasName=Form("t00_ac_atten",nAlias); + } for (int timeStamp=0;timeStamp