Changes and bugfixes by Uwe

diff --git a/TRD/AliTRDltuParam.cxx b/TRD/AliTRDltuParam.cxx
index ddc2bab7707d669bed68e9bcc8e756a680e339d0..bfa14cbdc7a48f9b6fbfadf83b5b97ff0074d793 100644 (file)
--- a/TRD/AliTRDltuParam.cxx
+++ b/TRD/AliTRDltuParam.cxx
@@ -36,8 +36,8 @@ AliTRDltuParam::AliTRDltuParam() :
   fOmegaTau(0.),
   fPtMin(0.1),
   fNtimebins(20 << 5),
-  fScaleQ0(1),
-  fScaleQ1(1),
+  fScaleQ0(0),
+  fScaleQ1(0),
   fPidTracklengthCorr(kFALSE),
   fTiltCorr(kFALSE)
 {

diff --git a/TRD/AliTRDtrapConfig.cxx b/TRD/AliTRDtrapConfig.cxx
index e26f6fcb011dd25b95299456103b1ce51fcb7fa3..595cf98c8d9723c6d502ccaa6c44bc7c5938b088 100644 (file)
--- a/TRD/AliTRDtrapConfig.cxx
+++ b/TRD/AliTRDtrapConfig.cxx
@@ -673,7 +673,7 @@ Bool_t AliTRDtrapConfig::SetTrapReg(TrapReg_t reg, Int_t value)
       return kTRUE;
    }
    else {
-      AliError("Register has individual values");
+      AliError(Form("Register %s has individual values", AliTRDtrapConfig::GetRegName(reg)));
    }
    return kFALSE;
 }

diff --git a/TRD/AliTRDtrapConfigHandler.cxx b/TRD/AliTRDtrapConfigHandler.cxx
index a618451617d63207546d8f954df246c6bd3dae14..ec502800479978ba04e508e19ff0edbe6ceaae65 100644 (file)
--- a/TRD/AliTRDtrapConfigHandler.cxx
+++ b/TRD/AliTRDtrapConfigHandler.cxx
@@ -42,7 +42,6 @@ ClassImp(AliTRDtrapConfigHandler)
 
 AliTRDtrapConfigHandler::AliTRDtrapConfigHandler() :
      ltuParam()
-     , fDet(0)
      , fRestrictiveMask((0x3ffff << 11) | (0x1f << 6) | 0x3f)
 {
 
@@ -116,25 +115,28 @@ Int_t AliTRDtrapConfigHandler::LoadConfig()
 
   // ndrift (+ 5 binary digits)
   ltuParam.SetNtimebins(20 << 5);
-  ConfigureNTimebins();
-
   // deflection + tilt correction
   ltuParam.SetRawOmegaTau(0.16133);
-  ConfigureDyCorr();
-
   // deflection range table
   ltuParam.SetRawPtMin(0.1);
-  ConfigureDRange();
-
-  // hit position LUT
-  // reset values
-  const UShort_t lutPos[128] = {
-    0,  1,  1,  2,  2,  3,  3,  4,  4,  5,  5,  6,  6,  7,  7,  8,  8,  9,  9, 10, 10, 11, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15,
-    16, 16, 16, 17, 17, 18, 18, 19, 19, 19, 20, 20, 20, 21, 21, 22, 22, 22, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 26, 26, 26, 26,
-    27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26,
-    26, 26, 26, 25, 25, 25, 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 19, 18, 18, 17, 17, 16, 15, 14, 13, 12, 11, 10,  9,  8,  7,  7};
-  for (Int_t iCOG = 0; iCOG < 128; iCOG++)
-    cfg->SetTrapReg((AliTRDtrapConfig::TrapReg_t) (AliTRDtrapConfig::kTPL00 + iCOG), lutPos[iCOG]);
+  // magnetic field
+  ltuParam.SetRawMagField(0.0);
+  // scaling factors for q0, q1
+  ltuParam.SetRawScaleQ0(0);
+  ltuParam.SetRawScaleQ1(0);
+  // disable length correction and tilting correction
+  ltuParam.SetRawLengthCorrectionEnable(kFALSE);
+  ltuParam.SetRawTiltCorrectionEnable(kFALSE);
+
+  // apply ltuParams to all detectors
+  for(Int_t det=0; det<AliTRDgeometry::Ndet(); det++) {
+     ConfigureDyCorr(det);
+     ConfigureDRange(det); // deflection range
+     ConfigureNTimebins(det);  // timebins in the drift region
+     ConfigurePIDcorr(det);  // scaling parameters for the PID
+  }
+
+  // ****** hit position LUT
 
   // now calculate it from PRF
   AliTRDcalibDB *cal = AliTRDcalibDB::Instance();
@@ -165,6 +167,7 @@ Int_t AliTRDtrapConfigHandler::LoadConfig()
       }
     }
   }
+  // ****** hit position LUT configuration end
 
   // event buffer
   cfg->SetTrapReg(AliTRDtrapConfig::kEBSF, 1);  // 0: store filtered; 1: store unfiltered
@@ -181,7 +184,8 @@ Int_t AliTRDtrapConfigHandler::LoadConfig()
   return 0;
 }
 
-Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename, Int_t det)
+
+Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename)
 {
    //
   // load a TRAP configuration from a file
@@ -191,8 +195,6 @@ Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename, Int_t det)
    // which are two tools to inspect/export configurations from wingDB
    //
 
-
-   fDet = det;
    Int_t ignoredLines=0;
    Int_t ignoredCmds=0;
    Int_t readLines=0;
@@ -213,10 +215,6 @@ Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename, Int_t det)
 
    // reset restrictive mask
    fRestrictiveMask = (0x3ffff << 11) | (0x1f << 6) | 0x3f;
-   Int_t sec   = AliTRDgeometry::GetSector(fDet);
-   Int_t stack = AliTRDgeometry::GetStack(fDet);
-   Int_t layer = AliTRDgeometry::GetLayer(fDet);
-   UInt_t rocpos = (1 << (sec+11)) | (1 << (stack+6)) | (1 << layer);
 
    while(infile.good()) {
       cmd=999;
@@ -224,22 +222,31 @@ Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename, Int_t det)
       addr=-1;
       data=-1;
       infile >> std::skipws >> cmd >> addr >> data >> extali;
-      //      std::cout << "no: " << no << ", cmd " << cmd << ", extali " << extali << ", addr " << addr << ", data " << data <<  endl;
 
       if(cmd!=999 && extali!=-1 && addr != -1 && data!= -1 && extali!=-1) {
-       if(cmd==fgkScsnCmdWrite) {
-         if ((fRestrictiveMask & rocpos) == rocpos)
-           cfg->AddValues(det, cmd, extali, addr, data);
-       }
-        else if(cmd == fgkScsnCmdRestr)
-          fRestrictiveMask = data;
-        else if(cmd == fgkScsnLTUparam)
+
+        if(cmd==fgkScsnCmdWrite) {
+           for(Int_t det=0; det<AliTRDgeometry::Ndet(); det++) {
+              UInt_t rocpos = (1 << (AliTRDgeometry::GetSector(det)+11)) | (1 << (AliTRDgeometry::GetStack(det)+6)) | (1 << AliTRDgeometry::GetLayer(det));
+              if ((fRestrictiveMask & rocpos) == rocpos)
+                 cfg->AddValues(det, cmd, extali, addr, data);
+           }
+        }
+
+        else if(cmd == fgkScsnLTUparam) {
            ProcessLTUparam(extali, addr, data);
+        }
+
+        else if(cmd == fgkScsnCmdRestr) {
+           fRestrictiveMask = data;
+        }
+
         else
            ignoredCmds++;
 
         readLines++;
       }
+
       else if(!infile.eof() && !infile.good()) {
         infile.clear();
         infile.ignore(256, '\n');
@@ -249,7 +256,7 @@ Int_t AliTRDtrapConfigHandler::LoadConfig(TString filename, Int_t det)
       if(!infile.eof())
         infile.clear();
    }
-
+      
    infile.close();
 
    AliDebug(5, Form("Ignored lines: %i, ignored cmds: %i", ignoredLines, ignoredCmds));
@@ -273,10 +280,12 @@ void AliTRDtrapConfigHandler::ProcessLTUparam(Int_t dest, Int_t addr, UInt_t dat
    switch (dest) {
 
    case 0: // set the parameters in AliTRDtrapConfig
-      ConfigureDyCorr();
-      ConfigureDRange(); // deflection range
-      ConfigureNTimebins();  // timebins in the drift region
-      ConfigurePIDcorr();  // scaling parameters for the PID
+      for(Int_t det=0; det<AliTRDgeometry::Ndet(); det++) {
+        ConfigureDyCorr(det);
+        ConfigureDRange(det); // deflection range
+        ConfigureNTimebins(det);  // timebins in the drift region
+        ConfigurePIDcorr(det);  // scaling parameters for the PID
+      }
       break;
 
    case 1: // set variables
@@ -301,17 +310,17 @@ void AliTRDtrapConfigHandler::ProcessLTUparam(Int_t dest, Int_t addr, UInt_t dat
 }
 
 
-void AliTRDtrapConfigHandler::ConfigureNTimebins()
+void AliTRDtrapConfigHandler::ConfigureNTimebins(Int_t det)
 {
    //
    // Set timebins in the drift region
    //
-  AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, 127, AliTRDtrapConfig::fgkDmemAddrNdrift, ltuParam.GetNtimebins());
+  AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, 127, AliTRDtrapConfig::fgkDmemAddrNdrift, ltuParam.GetNtimebins());
 }
 
 
 
-void AliTRDtrapConfigHandler::ConfigureDyCorr()
+void AliTRDtrapConfigHandler::ConfigureDyCorr(Int_t det)
 {
    //
    //  Deflection length correction
@@ -319,13 +328,13 @@ void AliTRDtrapConfigHandler::ConfigureDyCorr()
    //  This correction is in units of padwidth / (256*32)
    //
 
-  Int_t nRobs = AliTRDgeometry::GetStack(fDet) == 2 ? 6 : 8;
+   Int_t nRobs = AliTRDgeometry::GetStack(det) == 2 ? 6 : 8;
 
   for (Int_t r = 0; r < nRobs; r++) {
     for (Int_t m = 0; m < 16; m++) {
       Int_t dest =  1<<10 | r<<7 | m;
-      Int_t dyCorrInt = ltuParam.GetDyCorrection(fDet, r, m);
-      AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, dest, AliTRDtrapConfig::fgkDmemAddrDeflCorr, dyCorrInt);
+      Int_t dyCorrInt = ltuParam.GetDyCorrection(det, r, m);
+      AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, dest, AliTRDtrapConfig::fgkDmemAddrDeflCorr, dyCorrInt);
     }
   }
 }
@@ -334,7 +343,7 @@ void AliTRDtrapConfigHandler::ConfigureDyCorr()
 
 
 
-void AliTRDtrapConfigHandler::ConfigureDRange()
+void AliTRDtrapConfigHandler::ConfigureDRange(Int_t det)
 {
    //
    // deflection range LUT
@@ -343,7 +352,7 @@ void AliTRDtrapConfigHandler::ConfigureDRange()
    // deflection (-64..63) is used
    //
 
-  Int_t nRobs = AliTRDgeometry::GetStack(fDet) == 2 ? 6 : 8;
+  Int_t nRobs = AliTRDgeometry::GetStack(det) == 2 ? 6 : 8;
 
   Int_t dyMinInt;
   Int_t dyMaxInt;
@@ -357,9 +366,9 @@ void AliTRDtrapConfigHandler::ConfigureDRange()
           //   << ", min int: " << dyMinInt << ", max int: " << dyMaxInt << endl;
           Int_t dest =  1<<10 | r<<7 | m;
           Int_t lutAddr = AliTRDtrapConfig::fgkDmemAddrDeflCutStart + 2*c;
-          ltuParam.GetDyRange(fDet, r, m, c, dyMinInt, dyMaxInt);
-          AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, dest, lutAddr+0, dyMinInt);
-          AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, dest, lutAddr+1, dyMaxInt);
+          ltuParam.GetDyRange(det, r, m, c, dyMinInt, dyMaxInt);
+          AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, dest, lutAddr+0, dyMinInt);
+          AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, dest, lutAddr+1, dyMaxInt);
         }
       }
    }
@@ -376,14 +385,14 @@ void AliTRDtrapConfigHandler::PrintGeoTest()
    for(int stack=0; stack<5; stack++) {
       for(int layer=0; layer<6; layer++) {
 
-        fDet = sm*30+stack*6+layer;
+        Int_t det = sm*30+stack*6+layer;
         for (Int_t r = 0; r < 6; r++) {
            for (Int_t m = 0; m < 16; m++) {
               for (Int_t c = 7; c < 8; c++) {
                 cout << stack << ";" << layer << ";" << r << ";" << m
-                     << ";" << ltuParam.GetX(fDet, r, m)
-                     << ";" << ltuParam.GetLocalY(fDet, r, m, c)
-                     << ";" << ltuParam.GetLocalZ(fDet, r, m) << endl;
+                     << ";" << ltuParam.GetX(det, r, m)
+                     << ";" << ltuParam.GetLocalY(det, r, m, c)
+                     << ";" << ltuParam.GetLocalZ(det, r, m) << endl;
               }
            }
         }
@@ -393,7 +402,7 @@ void AliTRDtrapConfigHandler::PrintGeoTest()
 }
 
 
-void AliTRDtrapConfigHandler::ConfigurePIDcorr()
+void AliTRDtrapConfigHandler::ConfigurePIDcorr(Int_t det)
 {
    //
    // Calculate the MCM individual correction factors for the PID
@@ -406,14 +415,14 @@ void AliTRDtrapConfigHandler::ConfigurePIDcorr()
    UInt_t cor0;
    UInt_t cor1;
 
-   Int_t nRobs = AliTRDgeometry::GetStack(fDet) == 2 ? 6 : 8;
+   Int_t nRobs = AliTRDgeometry::GetStack(det) == 2 ? 6 : 8;
 
    for (Int_t r=0; r<nRobs; r++) {
       for(Int_t m=0; m<16; m++) {
         Int_t dest =  1<<10 | r<<7 | m;
-        ltuParam.GetCorrectionFactors(fDet, r, m, 0, cor0, cor1);
-        AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, dest, addrLUTcor0, cor0);
-        AliTRDtrapConfig::Instance()->AddValues(fDet, fgkScsnCmdWrite, dest, addrLUTcor1, cor1);
+        ltuParam.GetCorrectionFactors(det, r, m, 9, cor0, cor1);
+        AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, dest, addrLUTcor0, cor0);
+        AliTRDtrapConfig::Instance()->AddValues(det, fgkScsnCmdWrite, dest, addrLUTcor1, cor1);
     }
   }
 }

diff --git a/TRD/AliTRDtrapConfigHandler.h b/TRD/AliTRDtrapConfigHandler.h
index e59e668b2d4e9e982d4c7f144e5f068c3d588306..ef7368b58c63ee2cdaa7ff78eb0d65a0bd4a7e0f 100644 (file)
--- a/TRD/AliTRDtrapConfigHandler.h
+++ b/TRD/AliTRDtrapConfigHandler.h
@@ -22,7 +22,7 @@ class AliTRDtrapConfigHandler : public TObject {
 
   void ResetMCMs();                                           // Reset all trap registers and DMEM of the MCMs
   Int_t LoadConfig();                                         // load a default configuration suitable for simulation
-  Int_t LoadConfig(TString filename, Int_t det);              // load a TRAP configuration from a file
+  Int_t LoadConfig(TString filename);                         // load a TRAP configuration from a file
 
   void ProcessLTUparam(Int_t dest, Int_t addr, UInt_t data);  // Process the LTU parameters
   void PrintGeoTest();                                        // Prints some information about the geometry. Only for debugging
@@ -31,10 +31,10 @@ class AliTRDtrapConfigHandler : public TObject {
   // Int_t poke(Int_t rob, Int_t mcm, Int_t addr, UInt_t value);   // not implemented yet
 
  private:
-  void  ConfigureDyCorr();                                    // deflection length correction due to Lorentz angle and tilted pad correction
-  void  ConfigureDRange();                                    // deflection range LUT,  range calculated according to B-field (in T) and pt_min (in GeV/c)
-  void  ConfigureNTimebins();                                 // timebins in the drift region
-  void  ConfigurePIDcorr();                                   // Calculate the mcm individual correction factors for the PID
+  void  ConfigureDyCorr(Int_t det);                             // deflection length correction due to Lorentz angle and tilted pad correction
+  void  ConfigureDRange(Int_t det);                             // deflection range LUT,  range calculated according to B-field (in T) and pt_min (in GeV/c)
+  void  ConfigureNTimebins(Int_t det);                          // timebins in the drift region
+  void  ConfigurePIDcorr(Int_t det);                            // Calculate the mcm individual correction factors for the PID
 
   Double_t Square(Double_t val) { return val*val; };          // returns the square of a given number
 
@@ -51,8 +51,6 @@ class AliTRDtrapConfigHandler : public TObject {
 
   AliTRDltuParam     ltuParam;             // ltuParam class for the actual calculation of the parameters
 
-  Int_t fDet;                              // detector number (0 - 539)
-
   UInt_t fRestrictiveMask;                 // mask to restrict subsequent commands to specified chambers
 
   ClassDef(AliTRDtrapConfigHandler,0)