Added protection against wrongly formed cloning list

[u/mrichter/AliRoot.git] / TRD / AliTRDtrapConfigHandler.h

diff --git a/TRD/AliTRDtrapConfigHandler.h b/TRD/AliTRDtrapConfigHandler.h
index e59e668b2d4e9e982d4c7f144e5f068c3d588306..84af956e26fbe57ca448748236876a4dbfae4ae0 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,19 +31,32 @@ 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
 
   AliTRDtrapConfigHandler(const AliTRDtrapConfigHandler &h);             // not implemented
   AliTRDtrapConfigHandler &operator=(const AliTRDtrapConfigHandler &h);  // not implemented
 
-  static const UInt_t fgkScsnCmdWrite=10;  // SCSN command for the write command
-  static const UInt_t fgkScsnCmdRestr=18;  // SCSN command to restrict commands to specified chambers
-  static const UInt_t fgkScsnLTUparam=27;  // extended SCSN command for the LTU configuration
+  static const UInt_t fgkScsnCmdReset=6;     // SCSN command for reset
+  static const UInt_t fgkScsnCmdPause=8;     // SCSN command to pause
+  static const UInt_t fgkScsnCmdRead=9;      // SCSN command to read
+  static const UInt_t fgkScsnCmdWrite=10;    // SCSN command to write
+  static const UInt_t fgkScsnCmdPtrg=12;     // SCSN command for pretrigger
+  static const UInt_t fgkScsnCmdRobPower=16; // SCSN command to switch ROB power
+  static const UInt_t fgkScsnCmdRobReset=17; // SCSN command for ROB reset
+
+  static const UInt_t fgkScsnCmdRestr=18;    // SCSN command to restrict commands to specified chambers
+  static const UInt_t fgkScsnCmdTtcRx=19;    // SCSN command to configure TTCrx
+  static const UInt_t fgkScsnCmdHwPtrg=20;   // SCSN command to issue pretrigger pulse
+  static const UInt_t fgkScsnCmdSetHC=22;    // SCSN command to set HC ID
+  static const UInt_t fgkScsnCmdMcmTemp=24;  // SCSN command for MCM temperature sensors
+  static const UInt_t fgkScsnCmdPM=25;       // SCSN command for patchmaker
+  static const UInt_t fgkScsnCmdOri=26;      // SCSN command for ORI configuration
+  static const UInt_t fgkScsnLTUparam=27;    // extended SCSN command for the LTU configuration
 
   static const Int_t fgkMCMperROBCol = 4;  // MCMs per ROB column
   static const Int_t fgkPadsPerMCM = 18;   // readout pads per MCM
@@ -51,8 +64,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)