ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/grimes/L1Menu/src/MenuSample.cpp
(Generate patch)

Comparing UserCode/grimes/L1Menu/src/MenuSample.cpp (file contents):
Revision 1.6 by grimes, Thu Jun 6 15:05:04 2013 UTC vs.
Revision 1.7 by grimes, Fri Jun 28 14:30:08 2013 UTC

# Line 5 | Line 5
5  
6   #include <TSystem.h>
7  
8 < #include "l1menu/IEvent.h"
8 > #include "l1menu/L1TriggerDPGEvent.h"
9   #include "L1UpgradeNtuple.h"
10   #include "UserCode/L1TriggerUpgrade/interface/L1AnalysisDataFormat.h"
11   #include "UserCode/L1TriggerUpgrade/interface/L1AnalysisL1ExtraUpgradeDataFormat.h"
# Line 14 | Line 14
14   #include "UserCode/L1TriggerDPG/interface/L1AnalysisGMTDataFormat.h"
15  
16  
17 // I'll use the unnamed namespace for things that are only used in this file
18 namespace
19 {
20        /** Implementation of the l1menu::IEvent interface.
21         *
22         * @author Mark Grimes (mark.grimes@bristol.ac.uk)
23         * @date 21/May/2013
24         */
25        class EventImplementation : public l1menu::IEvent
26        {
27        public:
28                //
29                // These are the methods required by the IEvent interface
30                //
31                virtual L1Analysis::L1AnalysisDataFormat& rawEvent() { return rawEvent_; }
32                virtual const L1Analysis::L1AnalysisDataFormat& rawEvent() const { return rawEvent_; }
33                virtual bool* physicsBits() { return physicsBits_; }
34                virtual const bool* physicsBits() const { return physicsBits_; }
35                virtual float weight() const { return 1; }
36        protected:
37                L1Analysis::L1AnalysisDataFormat rawEvent_;
38                bool physicsBits_[128];
39        }; // end of the EventImplementation class
40
41 } // end of the unnamed namespace
42
17   namespace l1menu
18   {
19          class MenuSamplePrivateMembers
# Line 59 | Line 33 | namespace l1menu
33                  void fillDataStructure( int selectDataInput );
34                  void fillL1Bits();
35                  L1UpgradeNtuple inputNtuple;
36 <                ::EventImplementation currentEvent;
36 >                l1menu::L1TriggerDPGEvent currentEvent;
37          };
38   }
39  
# Line 426 | Line 400 | size_t l1menu::MenuSample::numberOfEvent
400          return static_cast<size_t>( pImple_->inputNtuple.GetEntries() );
401   }
402  
403 < const l1menu::IEvent& l1menu::MenuSample::getEvent( size_t eventNumber ) const
403 > const l1menu::L1TriggerDPGEvent& l1menu::MenuSample::getEvent( size_t eventNumber ) const
404   {
405          // Make sure the event number requested is valid. Use static_cast to get rid
406          // of the "comparison between signed and unsigned" compiler warning.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines