Tunnngs in/for calib data

sevdokim · May 1, 2015 · 5527f56 · 5527f56
1 parent d544cc0
commit 5527f56
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/AD/ADbase/AliADCalibData.cxx b/AD/ADbase/AliADCalibData.cxx
@@ -703,7 +703,7 @@ void AliADCalibData::SetDiscriThr(Float_t thr, Int_t board, Int_t channel)
   // threshold values expressed in units of ADC
   Int_t ch = AliADCalibData::GetOfflineChannelNumber(board,channel);
   if(ch >= 0){
-    if (thr > 0) {
+    if (thr >= 0) {
       fDiscriThr[ch]=thr;
       AliInfo(Form("Discriminator threshold for channel %d set to %f",ch,fDiscriThr[ch]));
     }

diff --git a/AD/ADbase/AliADDataDCS.cxx b/AD/ADbase/AliADDataDCS.cxx
@@ -151,26 +151,24 @@ Bool_t AliADDataDCS::ProcessData(TMap& aliasMap){
 
     	while((aValue = (AliDCSValue*) iterarray.Next())) {
 			UInt_t currentTime = aValue->GetTimeStamp();
-			//if(currentTime>fCtpEndTime) break; //What is this for?
 
    			values[iValue] = aValue->GetFloat();
    			times[iValue] = (Double_t) (currentTime);
 
 			if(iValue>0) {
 				if(values[iValue-1]>0.) variation = TMath::Abs(values[iValue]-values[iValue-1])/values[iValue-1];
-				if(variation > 0.01) fDeadChannel[kOfflineChannel[iAlias]] = kTRUE;
+				if(variation > 0.01) fDeadChannel[iAlias] = kTRUE;
 			}
 			fHv[iAlias]->Fill(values[iValue]);
-			printf("%s : %s : %f Dead=%d\n",fAliasNames[iAlias].Data(),TTimeStamp(currentTime).AsString(),values[iValue],fDeadChannel[kOfflineChannel[iAlias]]);
+			printf("%s : %s : %f Dead=%d\n",fAliasNames[iAlias].Data(),TTimeStamp(currentTime).AsString(),values[iValue],fDeadChannel[iAlias]);
    			iValue++;
     	}      
     	CreateGraph(iAlias, aliasArr->GetEntries(), times, values); // fill graphs 
 
   	// calculate mean and rms of the first two histos
-	// and convert index to aliroot channel
-	Int_t iChannel	   = kOfflineChannel[iAlias];	
-	fMeanHV[iChannel]  = fHv[iAlias]->GetMean();
-	fWidthHV[iChannel] = fHv[iAlias]->GetRMS();
+	Int_t iChannel	   = iAlias;	
+	fMeanHV[iAlias]  = fHv[iAlias]->GetMean();
+	fWidthHV[iAlias] = fHv[iAlias]->GetRMS();
 
     	delete[] values;
     	delete[] times;	

diff --git a/AD/macros/ADTestPreprocessor.C b/AD/macros/ADTestPreprocessor.C
@@ -11,7 +11,7 @@
 void ADTestPreprocessor()
 {
   // load library
-  gSystem->Load("$ALICE_ROOT/SHUTTLE/TestShuttle/libTestShuttle");
+  gSystem->Load("$ALICE_ROOT/../src/SHUTTLE/TestShuttle/libTestShuttle");
 
    // create AliTestShuttle instance
   // The parameters are run, startTime, endTime

diff --git a/AD/macros/DCSValues.txt b/AD/macros/DCSValues.txt
@@ -104,14 +104,14 @@ AD0/FEE/CIU0/DelayHit5	100
 AD0/FEE/CIU0/DelayHit6	100
 AD0/FEE/CIU0/DelayHit7	100
 AD0/FEE/CIU0/DelayHit8	100
-AD0/FEE/CIU0/DiscriThr1	2000
-AD0/FEE/CIU0/DiscriThr2	2000
-AD0/FEE/CIU0/DiscriThr3	2000
-AD0/FEE/CIU0/DiscriThr4	2000
-AD0/FEE/CIU0/DiscriThr5	2000
-AD0/FEE/CIU0/DiscriThr6	2000
-AD0/FEE/CIU0/DiscriThr7	2000
-AD0/FEE/CIU0/DiscriThr8	2000
+AD0/FEE/CIU0/DiscriThr1	2040
+AD0/FEE/CIU0/DiscriThr2	2050
+AD0/FEE/CIU0/DiscriThr3	2040
+AD0/FEE/CIU0/DiscriThr4	2050
+AD0/FEE/CIU0/DiscriThr5	2040
+AD0/FEE/CIU0/DiscriThr6	2050
+AD0/FEE/CIU0/DiscriThr7	2080
+AD0/FEE/CIU0/DiscriThr8	2090
 AD0/FEE/CIU1/Clk1Win1				3
 AD0/FEE/CIU1/Clk2Win1	14
 AD0/FEE/CIU1/Clk1Win2	7