Dropping references to AliMUONLocalTrigger which are depricated. This is a temporary...

diff --git a/HLT/MUON/src/AliRoot/TriggerSource.cxx b/HLT/MUON/src/AliRoot/TriggerSource.cxx
index 767dd91f420457ab6705677b798f34a0a67e1723..0619d2a28ecc864ea29face897cfcb891a808d6f 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerSource.cxx
+++ b/HLT/MUON/src/AliRoot/TriggerSource.cxx
@@ -20,7 +20,7 @@
 #include "AliMUON.h"
 #include "AliMUONConstants.h"
 #include "AliMUONHit.h"
 #include "AliMUON.h"
 #include "AliMUONConstants.h"
 #include "AliMUONHit.h"

-#include "AliMUONLocalTrigger.h"
+//#include "AliMUONLocalTrigger.h"

 #include "AliMUONTriggerCircuit.h"
 #include "AliMUONDataInterface.h"
 #include "TDatabasePDG.h"
 #include "AliMUONTriggerCircuit.h"
 #include "AliMUONDataInterface.h"
 #include "TDatabasePDG.h"


@@ -675,7 +675,8 @@ void AliHLTMUONTriggerSource::AddEventFrom(AliMUONDataInterface* data, AliMUON*
 
                case kFromLocalTriggers:
                        Assert( module != NULL );
 
                case kFromLocalTriggers:
                        Assert( module != NULL );

-                       DebugMsg(4, "Taking kFromLocalTriggers branch...");
+                       DebugMsg(4, "THIS OPTION IS DEPRICATED!!!");
+/* THIS CODE IS DEPRICATED (to be removed)

                        for (Int_t i = 0; i < data->NumberOfLocalTriggers(); i++)
                        {
                                DebugMsg(4, "for loop: i = " << i);
                        for (Int_t i = 0; i < data->NumberOfLocalTriggers(); i++)
                        {
                                DebugMsg(4, "for loop: i = " << i);


@@ -695,6 +696,7 @@ void AliHLTMUONTriggerSource::AddEventFrom(AliMUONDataInterface* data, AliMUON*
                                        }
                                }
                        }
                                        }
                                }
                        }

+*/

                        break;
 
                default:
                        break;
 
                default:


@@ -726,10 +728,12 @@ void AliHLTMUONTriggerSource::AddTriggerFrom(AliMUONDataInterface* data, AliMUON
 
        case kFromLocalTriggers:
                {
 
        case kFromLocalTriggers:
                {

+/* THIS CODE IS DEPRICATED (to be removed)

                Assert( module != NULL );
                AliMUONLocalTrigger* lt = data->LocalTrigger(trigger);
                FillTriggerFromLocalTrigger(lt, module, trigdata);
                trigdata.TriggerNumber(trigger);
                Assert( module != NULL );
                AliMUONLocalTrigger* lt = data->LocalTrigger(trigger);
                FillTriggerFromLocalTrigger(lt, module, trigdata);
                trigdata.TriggerNumber(trigger);

+*/

                }
                break;
 
                }
                break;
 


@@ -763,6 +767,8 @@ Bool_t AliHLTMUONTriggerSource::InFillRegion(const AliHLTMUONTriggerRecord& data
 }
 
 
 }
 
 

+/* THIS CODE IS DEPRICATED (to be removed)
+

 void AliHLTMUONTriggerSource::FillTriggerFromLocalTrigger(
                AliMUONLocalTrigger* trigger, AliMUON* module, AliHLTMUONTriggerRecord& record
        )
 void AliHLTMUONTriggerSource::FillTriggerFromLocalTrigger(
                AliMUONLocalTrigger* trigger, AliMUON* module, AliHLTMUONTriggerRecord& record
        )


@@ -814,6 +820,7 @@ void AliHLTMUONTriggerSource::FillTriggerFromLocalTrigger(
        DebugMsg(2, "fStation2x = " << record.Station2Point().X());
        DebugMsg(2, "fStation2y = " << record.Station2Point().Y());
 }
        DebugMsg(2, "fStation2x = " << record.Station2Point().X());
        DebugMsg(2, "fStation2y = " << record.Station2Point().Y());
 }

+*/

 
 
 Bool_t AliHLTMUONTriggerSource::FillTriggerFromHits(
 
 
 Bool_t AliHLTMUONTriggerSource::FillTriggerFromHits(

diff --git a/HLT/MUON/src/AliRoot/TriggerSource.hpp b/HLT/MUON/src/AliRoot/TriggerSource.hpp
index f77cebcaf924eff10d35e531d44e5cb35cfb2cd5..4cb85fefc017b3a2c8df2fa892d1cfb2616507f8 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerSource.hpp
+++ b/HLT/MUON/src/AliRoot/TriggerSource.hpp
@@ -21,7 +21,7 @@
 #include "AliRoot/TriggerRecord.hpp"
 
 class AliMUON;
 #include "AliRoot/TriggerRecord.hpp"
 
 class AliMUON;

-class AliMUONLocalTrigger;
+//class AliMUONLocalTrigger;

 class AliMUONDataInterface;
 
 
 class AliMUONDataInterface;
 
 


@@ -266,10 +266,13 @@ private:
           if the fUseLookupTable is set to true then we use the L0 lookup table to
           fill the Pt value otherwise we use the PtCal method in AliMUONTriggerCircuit.
           Note the fTriggerNumber parameter is not filled in to 'record'.
           if the fUseLookupTable is set to true then we use the L0 lookup table to
           fill the Pt value otherwise we use the PtCal method in AliMUONTriggerCircuit.
           Note the fTriggerNumber parameter is not filled in to 'record'.

+          THIS METHOD IS DEPRICATED

         */
         */

+/*

        void FillTriggerFromLocalTrigger(
                        AliMUONLocalTrigger* trigger, AliMUON* module, AliHLTMUONTriggerRecord& record
                );
        void FillTriggerFromLocalTrigger(
                        AliMUONLocalTrigger* trigger, AliMUON* module, AliHLTMUONTriggerRecord& record
                );

+*/

        
        /* Fills the TriggerRecord structure from AliMUONHit objects.
           The hits on the last 4 chambers are used (i.e. chambers 11 to 14).
        
        /* Fills the TriggerRecord structure from AliMUONHit objects.
           The hits on the last 4 chambers are used (i.e. chambers 11 to 14).