from L2+EF to merged HLT. (TagEvent-00-05-19)

	* TagEvent/GlobalTriggerAttributeNames.h: changes from L2+EF to combined HLT.
	* TagEvent/GlobalGroupAndUnitNames.h: same here
	* tag as: TagEvent-00-05-19

PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalGroupAndUnitNames.h

@@ -15,7 +15,7 @@
 
 namespace Grp {
     //static const int NGroupNames = 16;
-    enum { Nav=0, Time=1, Vertex=2, Quality=3, PhysicsElectron=4, PhysicsPhoton=5, PhysicsMuon=6, PhysicsTau=7,   PhysicsJetmet=8, TriggerL1=9, TriggerL2=10, TriggerEF=11, TriggerStream=12, QualityDetector=13, QualityPhysics=14,  RawSummary=15, Test=16, NGroupNames=17 };
+    enum { Nav=0, Time=1, Vertex=2, Quality=3, PhysicsElectron=4, PhysicsPhoton=5, PhysicsMuon=6, PhysicsTau=7,   PhysicsJetmet=8, TriggerL1=9, TriggerHLT=10, TriggerStream=11, QualityDetector=12, QualityPhysics=13,  RawSummary=14, Test=15, NGroupNames=16 };
     
 }    
     
@@ -30,8 +30,7 @@ static const std::string GroupNames[Grp::NGroupNames] = {  "NAV",
                                                            "PHYSICS_TAU",
                                                            "PHYSICS_JETMET",
                                                            "TRIGGER_L1",
-                                                           "TRIGGER_L2", 
-                                                           "TRIGGER_EF",
+                                                           "TRIGGER_HLT",
                                                            "TRIGGER_STREAM", 
                                                            "QUALITY_DETECTOR", 
                                                            "QUALITY_PHYSICS",

PhysicsAnalysis/EventTag/TagEvent/TagEvent/GlobalTriggerAttributeNames.h

@@ -15,16 +15,15 @@
 
 /** list of ALL the Trigger status attributes */
 namespace Trg { 
-   static const int Ntrg = 5;      // This is the number of Trigger TAG attributes 
-   static const int NumTrig = 8;   // This is the max number of Trigger words in the TAG per some attributes
-   enum { LVL1=0, LVL2=1, EF=2, Stream=3, BunchGroup=4 }; 
+   static const int Ntrg = 4;      // This is the number of Trigger TAG attributes 
+   static const int NumTrig = 16;   // This is the max number of Trigger words in the TAG per some attributes
+   enum { LVL1=0, HLT=1, Stream=2, BunchGroup=3 }; 
 }
 
 /** This is the list of the Trigger TAG attributes */
 static const std::string TriggerAttributeNames[Trg::Ntrg] = {
                                                        "L1PassedTrigMask",
-                                                       "L2PassedTrigMask",
-                                                       "EFPassedTrigMask",
+                                                       "HLTPassedTrigMask",
                                                        "SFOStreams",
                                                        "BunchGroup"
                                                    };
@@ -34,15 +33,13 @@ static const std::string TriggerAttributeUnitNames[Trg::Ntrg] = {
                                                         UnitNames[Unt::Bitmask],
                                                         UnitNames[Unt::Bitmask],
                                                         UnitNames[Unt::Bitmask],
-                                                        UnitNames[Unt::Bitmask],
                                                         UnitNames[Unt::Number]
                                                    };
 
 /** This is the list of the Trigger TAG attributes group names*/
 static const std::string TriggerAttributeGroupNames[Trg::Ntrg] = {
                                                        GroupNames[Grp::TriggerL1],
-                                                       GroupNames[Grp::TriggerL2],
-                                                       GroupNames[Grp::TriggerEF],
+                                                       GroupNames[Grp::TriggerHLT],
                                                        GroupNames[Grp::TriggerStream],
                                                        GroupNames[Grp::TriggerStream]
                                                    };