-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for ensuring backward compatibility
- Loading branch information
Sunanda
committed
Jan 17, 2014
1 parent
05a8be6
commit e2af6f5
Showing
33 changed files
with
1,099 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #ifndef DataFormats_ForwardDetId_ForwardSubDetector_H | ||
| #define DataFormats_ForwardDetId_ForwardSubDetector_H 1 | ||
|
|
||
| enum ForwardSubdetector { ForwardEmpty=0, ForwardCFC=1, ForwardBHM=2}; | ||
| enum ForwardSubdetector { ForwardEmpty=0, ForwardCFC=1, ForwardBHM=2, HGCEE=3, HGCHE=4}; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #ifndef DataFormats_ForwardDetId_HGCEEDetId_H | ||
| #define DataFormats_ForwardDetId_HGCEEDetId_H 1 | ||
|
|
||
| #include <iosfwd> | ||
| #include "DataFormats/DetId/interface/DetId.h" | ||
| #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h" | ||
|
|
||
|
|
||
| class HGCEEDetId : public DetId { | ||
| public: | ||
| enum { Subdet=HGCEE}; | ||
| /** Create a null cellid*/ | ||
| HGCEEDetId(); | ||
| /** Create cellid from raw id (0=invalid tower id) */ | ||
| HGCEEDetId(uint32_t rawid); | ||
| /** Constructor from subdetector, zplus, layer, module, cell numbers */ | ||
| HGCEEDetId(ForwardSubdetector subdet, int zp, int lay, int mod, | ||
| int cellx, int celly); | ||
| /** Constructor from a generic cell id */ | ||
| HGCEEDetId(const DetId& id); | ||
| /** Assignment from a generic cell id */ | ||
| HGCEEDetId& operator=(const DetId& id); | ||
|
|
||
| /// get the subdetector | ||
| ForwardSubdetector subdet() const { return HGCEE; } | ||
| /// get the z-side of the cell (1/-1) | ||
| int zside() const { return (id_&0x1000000)?(1):(-1); } | ||
| /// get the absolute value of the cell #'s in x and y | ||
| int cellX() const { return (id_>>6)&0x3F; } | ||
| int cellY() const { return id_&0x3F; } | ||
| /// get the module # | ||
| int module() const { return (id_>>12)&0x3F; } | ||
| /// get the layer # | ||
| int layer() const { return (id_>>18)&0x3F; } | ||
|
|
||
| static const HGCEEDetId Undefined; | ||
|
|
||
| }; | ||
|
|
||
| std::ostream& operator<<(std::ostream&,const HGCEEDetId& id); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #ifndef DataFormats_ForwardDetId_HGCHEDetId_H | ||
| #define DataFormats_ForwardDetId_HGCHEDetId_H 1 | ||
|
|
||
| #include <iosfwd> | ||
| #include "DataFormats/DetId/interface/DetId.h" | ||
| #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h" | ||
|
|
||
|
|
||
| class HGCHEDetId : public DetId { | ||
| public: | ||
| enum { Subdet=HGCHE}; | ||
| /** Create a null cellid*/ | ||
| HGCHEDetId(); | ||
| /** Create cellid from raw id (0=invalid tower id) */ | ||
| HGCHEDetId(uint32_t rawid); | ||
| /** Constructor from subdetector, zplus, layer, module, cell numbers */ | ||
| HGCHEDetId(ForwardSubdetector subdet, int zp, int lay, int mod, | ||
| int cellx, int celly); | ||
| /** Constructor from a generic cell id */ | ||
| HGCHEDetId(const DetId& id); | ||
| /** Assignment from a generic cell id */ | ||
| HGCHEDetId& operator=(const DetId& id); | ||
|
|
||
| /// get the subdetector | ||
| ForwardSubdetector subdet() const { return HGCHE; } | ||
| /// get the z-side of the cell (1/-1) | ||
| int zside() const { return (id_&0x1000000)?(1):(-1); } | ||
| /// get the absolute value of the cell #'s in x and y | ||
| int cellX() const { return (id_>>6)&0x3F; } | ||
| int cellY() const { return id_&0x3F; } | ||
| /// get the module # | ||
| int module() const { return (id_>>12)&0x3F; } | ||
| /// get the layer # | ||
| int layer() const { return (id_>>18)&0x3F; } | ||
|
|
||
| static const HGCHEDetId Undefined; | ||
|
|
||
| }; | ||
|
|
||
| std::ostream& operator<<(std::ostream&,const HGCHEDetId& id); | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.