switch to activate trigger coincidence 3/4 or 4/4

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index f571fd68f849d4dcd21fca4ac2836e78a88ac55e..22a13c023755286a80616819ed3041a6d95798c5 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -119,6 +119,8 @@ AliMUON::AliMUON()
     fMaxIterPad(0),
     fCurIterPad(0),
     fTriggerScalerEvent(kFALSE),
+    fTriggerResponseV1(kFALSE),
+    fTriggerCoinc44(0),
     fSDigitizerType(""),
     fDigitizerType(""),
   fRawWriter(0x0)
@@ -152,7 +154,9 @@ AliMUON::AliMUON(const char *name, const char *title,
     fMaxDestepAlu(-1), // in the calculation of the tracking parameters
     fMaxIterPad(0),
     fCurIterPad(0),
-         fTriggerScalerEvent(kFALSE),
+    fTriggerScalerEvent(kFALSE),
+    fTriggerResponseV1(kFALSE),
+    fTriggerCoinc44(0),
     fSDigitizerType(sDigitizerClassName),
     fDigitizerType(digitizerClassName),
   fRawWriter(0x0)
@@ -604,3 +608,13 @@ Bool_t  AliMUON::GetTriggerResponseV1() const
     
 }  
 
+//____________________________________________________________________
+Int_t  AliMUON::GetTriggerCoinc44() const
+{
+///
+/// Returns fTriggerCoinc44
+///  
+    return fTriggerCoinc44;
+    
+}  
+

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 532ef55a7d1efa75266c3765d7b5286264cc4d6d..bef888f15125ea30804cc382f109ec6ecdfddb09 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -126,6 +126,10 @@ class AliMUON : public  AliDetector
     virtual void  SetTriggerResponseV1(Bool_t trigResV1 = false)
        {fTriggerResponseV1 = trigResV1;}
     virtual Bool_t GetTriggerResponseV1() const;
+    // trigger coinc44
+    virtual void  SetTriggerCoinc44(Int_t trigCoinc44 = 0)
+       {fTriggerCoinc44 = trigCoinc44;}
+    virtual Int_t GetTriggerCoinc44() const;
     
     // Getters
                   /// Return reference to Chamber \a id
@@ -181,6 +185,7 @@ class AliMUON : public  AliDetector
     // setting scaler for trigger
     Bool_t fTriggerScalerEvent; ///< Flag to generates scaler event
     Bool_t fTriggerResponseV1;  ///< Flag to select TriggerResponseV1
+    Int_t  fTriggerCoinc44;     ///< Flag to select TriggerCoinc44 
     
     TString fSDigitizerType;    ///< Class to use for SDigitizer
     TString fDigitizerType;     ///< Class to use for Digitizer

diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx
index ac8cfb8b1b70d4681c81f725e6d01748e63a29f2..46e042c86a5ab5561f1debf2ec4544fb5739978a 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.cxx
+++ b/MUON/AliMUONLocalTriggerBoard.cxx
@@ -64,7 +64,8 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard()
       fStripY11(0),
       fDev(0),
       fOutput(0),
-      fLUT(0x0)      
+      fLUT(0x0),
+      fCoinc44(0)      
 {
 //* constructor
 //*
@@ -95,7 +96,8 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const char *name, Int_t a,
       fStripY11(0),
       fDev(0),
       fOutput(0),
-      fLUT(lut)
+      fLUT(lut),
+      fCoinc44(0)
 {
 //* constructor
 //*
@@ -125,7 +127,8 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const AliMUONLocalTriggerBoar
       fStripY11(right.fStripY11),
       fDev(right.fDev),
       fOutput(right.fOutput),
-      fLUT(right.fLUT)
+      fLUT(right.fLUT),
+      fCoinc44(right.fCoinc44)
 {  
 /// Protected copy constructor (not implemented)
 
@@ -468,8 +471,7 @@ void AliMUONLocalTriggerBoard::Module(char *mod)
 }
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[32], Int_t ch4q[32], 
-                                     Int_t coinc44)
+void AliMUONLocalTriggerBoard::TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[32], Int_t ch4q[32])
 {
 // note : coinc44 = flag 0 or 1 (0 coincidence -> 3/4, 1 coincidence -> 4/4)
 //---------------------------------------------------------
@@ -577,7 +579,7 @@ void AliMUONLocalTriggerBoard::TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[
       !dbleHit1[14] & !dbleHit1[13] & !dbleHit1[12] & !dbleHit1[11] & 
       !dbleHit1[10] & !dbleHit1[9]  & !dbleHit1[8]  & !dbleHit1[7]  & 
       !dbleHit1[6]  & !dbleHit1[5]  & !dbleHit1[4]  & !dbleHit1[3]  & 
-      !dbleHit1[2]  & !dbleHit1[1]  & !dbleHit1[0]  & !coinc44;
+      !dbleHit1[2]  & !dbleHit1[1]  & !dbleHit1[0]  & !fCoinc44;
 
    Int_t notOr2= !dbleHit2[62] & !dbleHit2[61] & !dbleHit2[60] & !dbleHit2[59] & 
       !dbleHit2[58] & !dbleHit2[57] & !dbleHit2[56] & !dbleHit2[55] & 
@@ -594,7 +596,7 @@ void AliMUONLocalTriggerBoard::TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[
       !dbleHit2[14] & !dbleHit2[13] & !dbleHit2[12] & !dbleHit2[11] & 
       !dbleHit2[10] & !dbleHit2[9]  & !dbleHit2[8]  & !dbleHit2[7]  & 
       !dbleHit2[6]  & !dbleHit2[5]  & !dbleHit2[4]  & !dbleHit2[3]  & 
-      !dbleHit2[2]  & !dbleHit2[1]  & !dbleHit2[0]  & !coinc44;        
+      !dbleHit2[2]  & !dbleHit2[1]  & !dbleHit2[0]  & !fCoinc44;       
 
 // DS reduction
    for (i=0; i<31; i++) {
@@ -854,8 +856,7 @@ void AliMUONLocalTriggerBoard::Sort2x5(Int_t dev1[6], Int_t dev2[6],
 
 //___________________________________________
 void AliMUONLocalTriggerBoard::TrigY(Int_t y1[16], Int_t y2[16], Int_t y3[16], Int_t y4[16],
-                                     Int_t y3u[16], Int_t y3d[16], Int_t y4u[16], Int_t y4d[16],
-                                     Int_t coinc44)
+                                     Int_t y3u[16], Int_t y3d[16], Int_t y4u[16], Int_t y4d[16])
 {
 // note : resMid = 1 -> cancel 
 //---------------------------------------------------------
@@ -1006,8 +1007,8 @@ void AliMUONLocalTriggerBoard::TrigY(Int_t y1[16], Int_t y2[16], Int_t y3[16], I
       !dble2[3]  & !dble2[2]  & !dble2[1]  & !dble2[0];
 
    for (i=0; i<16; i++) {
-      sgle1[i] = sgle1[i] & notOr1 & !coinc44;
-      sgle2[i] = sgle2[i] & notOr2 & !coinc44;
+      sgle1[i] = sgle1[i] & notOr1 & !fCoinc44;
+      sgle2[i] = sgle2[i] & notOr2 & !fCoinc44;
    }
 
 //---------------------------------------------------------
@@ -1292,9 +1293,9 @@ void AliMUONLocalTriggerBoard::Response()
       xXX4[i+24] = x4u[i];
    }
    
-   Int_t coinc44 = 0;
+//   Int_t coinc44 = 0;
    
-   TrigX(xX1, xX2, xXX3, xXX4, coinc44);   
+   TrigX(xX1, xX2, xXX3, xXX4);   
 
    Int_t yY1[16], yY2[16], yY3[16], yY4[16];
    
@@ -1328,7 +1329,7 @@ void AliMUONLocalTriggerBoard::Response()
       yY4D[i] = y4d[i];
    }
 
-   TrigY(yY1, yY2, yY3, yY4, yY3U, yY3D, yY4U, yY4D, coinc44);
+   TrigY(yY1, yY2, yY3, yY4, yY3U, yY3D, yY4U, yY4D);
    
 // ASIGN fLutLpt, fLutHpt, fLutApt
    LocalTrigger(); 

diff --git a/MUON/AliMUONLocalTriggerBoard.h b/MUON/AliMUONLocalTriggerBoard.h
index d598ba2adf0647540febcb0b53f7f62708d0cf8e..22e6fb4fe128b086934d44dd4f51b1589c8e2433 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.h
+++ b/MUON/AliMUONLocalTriggerBoard.h
@@ -41,7 +41,8 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
       Bool_t HasLUT() const { return (fLUT != 0); }
       
       void SetLUT(AliMUONTriggerLut* lut) { fLUT = lut; }
-
+      void SetCoinc44(Int_t coinc44=0) { fCoinc44 = coinc44; }
+      
       virtual void     Setbit(Int_t strip, Int_t cathode, Int_t chamber);
       virtual void     SetbitM(Int_t strip, Int_t cathode, Int_t chamber);
 
@@ -83,15 +84,13 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual void     Mask(Int_t index, UShort_t value);
 
-      virtual void     TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[32], Int_t ch4q[32], 
-                             Int_t coinc44);
+      virtual void     TrigX(Int_t ch1q[16], Int_t ch2q[16], Int_t ch3q[32], Int_t ch4q[32]);
       
       virtual void     Sort2x5(Int_t dev1[6], Int_t dev2[6],
                                Int_t minDev[6], Int_t &dev1GTdev2);
       
       virtual void     TrigY(Int_t y1[16], Int_t y2[16], Int_t y3[16], Int_t y4[16],
-                             Int_t y3u[16], Int_t y3d[16], Int_t y4u[16], Int_t y4d[16], 
-                             Int_t coinc44);
+                             Int_t y3u[16], Int_t y3d[16], Int_t y4u[16], Int_t y4d[16]);
 
       virtual void     SetXYU(UShort_t V[2][4]) {for (Int_t i=0;i<2;i++) for (Int_t j=0;j<4;j++) fXYU[i][j] = V[i][j];}
 
@@ -154,8 +153,9 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
       Int_t    fMinDevStrip[5];   ///< X (from algo)
       Int_t    fMinDev[5];        ///< Dev (from algo)
       Int_t    fCoordY[5];        ///< Y (from algo)
-
+      
       AliMUONTriggerLut *fLUT;    //!< Pointer to trigger LUT, that we do not own.
+      Int_t    fCoinc44;          ///< Coinc 44 (0/1 = coinc34/coinc44)
       
       ClassDef(AliMUONLocalTriggerBoard,1) 
 };

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index 51bc3722d326c1e342f90c027cd6a42b8ad9aeaf..aaf996e41730edfd8c199490b7c66285524db271 100644 (file)
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -107,7 +107,15 @@ void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
 {  
  //* BUILD ALL ELECTRONICS
  //*
- 
+
+// get coinc44 from AliMUON (added 12/09/06)
+  AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
+  Int_t coinc44 = pMUON->GetTriggerCoinc44();
+  if (coinc44 != 0 && coinc44 != 1) {
+      AliFatal("Coinc 44 should be equal to 0 or 1");
+      return;
+  }
+
   fCrates->ReadFromFile(gSystem->ExpandPathName(fSourceFileName.Data()));
   
   if ( !calibData ) return;
@@ -123,6 +131,7 @@ void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
   while ( (localBoard=fCrates->NextLocalBoard()) )
   {
     localBoard->SetLUT(lut);
+    localBoard->SetCoinc44(coinc44);
   }
 }
 

diff --git a/MUON/Config.C b/MUON/Config.C
index cc58260d7c9cf405f7ffe7ece4b529cd14b76002..5d7e9a2f1a45057d8de48de86837af456d743ded 100644 (file)
--- a/MUON/Config.C
+++ b/MUON/Config.C
@@ -171,10 +171,12 @@ void Config(char directory[100]="", char option[6]="param")
   // To get brand new trigger code, please use :
   //
   // AliMUON *MUON = new AliMUONv1("MUON", "FactoryV4",
-  //                               "sdigitizer:AliMUONSDigitizerV2",
-  //                               "digitizer:NewDigitizerNewTrigger");
+  //                           "sdigitizer:AliMUONSDigitizerV2",
+  //                           "digitizer:NewDigitizerNewTrigger");
   // activate trigger cluster-size i.e. ResponseTriggerV1 (default/v1 = 0/1)
   // MUON->SetTriggerResponseV1(0);
+  // activate 4/4 trigger coincidence (0(default)/1 = coinc 34/44)
+  // MUON->SetTriggerCoinc44(0);
   //
   // To enable Trigger Chamber Efficiency, please use :
   //