New survey data for V0A (Lizardo)

[u/mrichter/AliRoot.git] / ITS / AliITSPreprocessorSDD.cxx

diff --git a/ITS/AliITSPreprocessorSDD.cxx b/ITS/AliITSPreprocessorSDD.cxx
index 80038314852f95d1829800ed6b74677c16e469eb..e2158212ce6cee72161685a2451d65526d14572c 100644 (file)
--- a/ITS/AliITSPreprocessorSDD.cxx
+++ b/ITS/AliITSPreprocessorSDD.cxx
@@ -28,6 +28,7 @@
 #include "AliITSDriftSpeedSDD.h"
 #include "AliITSDriftSpeedArraySDD.h"
 #include "AliITSDCSAnalyzerSDD.h"
+#include "AliITSHLTforSDD.h"
 #include "AliShuttleInterface.h"
 #include "AliCDBEntry.h"
 #include "AliCDBMetaData.h"
@@ -121,6 +122,16 @@ UInt_t AliITSPreprocessorSDD::ProcessPulser(AliITSDDLModuleMapSDD* ddlmap){
     ind++;
   }
   delete sourceList;
+  // Read ADC sampling frequency from fee.conf
+  Int_t amSamplFreq=40;
+  FILE* feefil=fopen("fee.conf","r");
+  if(feefil){
+    fscanf(feefil,"%d \n",&amSamplFreq);
+    fclose(feefil);
+    Log(Form("AM sampling frequency = %d MHz",amSamplFreq));
+  }else{
+    Log("File fee.conf not found. AM sampling set at 40 MHz by default");
+  }
   
   for(Int_t iddl=0;iddl<kNumberOfDDL;iddl++){
     for(Int_t imod=0;imod<kModulesPerDDL;imod++){
@@ -128,7 +139,7 @@ UInt_t AliITSPreprocessorSDD::ProcessPulser(AliITSDDLModuleMapSDD* ddlmap){
       if(modID==-1) continue;
       modID-=240; // to have SDD modules numbering from 0 to 260
       AliITSCalibrationSDD *cal = new AliITSCalibrationSDD("simulated");
-      cal->SetUseCorrectionMaps(0,0); // temporary disabling of maps
+      if(amSamplFreq!=40) cal->SetAMAt20MHz();
       numOfBadChannels[modID]=0;
       Int_t badch[kNumberOfChannels];
       for(Int_t isid=0;isid<=1;isid++){
@@ -240,7 +251,7 @@ UInt_t AliITSPreprocessorSDD::ProcessInjector(AliITSDDLModuleMapSDD* ddlmap){
        }
        fscanf(injFil,"%d",&polDeg);
        while (!feof(injFil)){
-         fscanf(injFil,"%d %d ",&evNumb,&timeStamp);
+         fscanf(injFil,"%d %u ",&evNumb,&timeStamp);
          if(feof(injFil)) break;
          for(Int_t ic=0;ic<4;ic++){ 
            fscanf(injFil,"%f ",&auxP);
@@ -255,6 +266,7 @@ UInt_t AliITSPreprocessorSDD::ProcessInjector(AliITSDDLModuleMapSDD* ddlmap){
            modSet[2*modID+isid]=1;
          }
        }
+       fclose(injFil);
        Log(Form("Put calib obj for hybrid %d (DDL %d  Carlos %d)",2*modID+isid,iddl,imod));
        if(modSet[2*modID+isid]) vdrift.AddAt(arr,2*modID+isid);
       }